Added CutSet framework with TCutSimple

Martin Vala · Martin Vala · commit f7469b868616 · 2012-09-05T13:02:26.000+02:00
diff --git a/.cproject b/.cproject
@@ -18,7 +18,7 @@
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.2027195071.1539894065" name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.base.610516042" name="cdt.managedbuild.toolchain.gnu.base" nonInternalBuilderId="cdt.managedbuild.target.gnu.builder.base" superClass="cdt.managedbuild.toolchain.gnu.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.1096358058" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
-							<builder buildPath="${workspace_loc:/root-utils}/" command="${workspace_loc:/root-utils}/scripts/make.sh" id="cdt.managedbuild.target.gnu.builder.base.136499274" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<builder arguments="install" buildPath="${workspace_loc:/root-utils}/" command="${workspace_loc:/root-utils}/scripts/make.sh" id="cdt.managedbuild.target.gnu.builder.base.136499274" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.2123894816" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1686965596" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
 								<option id="gnu.cpp.compiler.option.include.paths.416754120" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
@@ -62,4 +62,16 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+		<buildTargets>
+			<target name="install" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>/home/mvala/git/root-utils/scripts/make.sh</buildCommand>
+				<buildArguments/>
+				<buildTarget>install</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+		</buildTargets>
+	</storageModule>
 </cproject>
diff --git a/CutSet/CMakeLists.txt b/CutSet/CMakeLists.txt
@@ -2,6 +2,7 @@
 set(SRCS
 TCutObj.cxx
 TCutSet.cxx
+TCutSimple.cxx
 )
 
 set(INCLUDE_DIRECTORIES
diff --git a/CutSet/CutSetLinkDef.h b/CutSet/CutSetLinkDef.h
@@ -7,4 +7,6 @@
 #pragma link C++ class TCutObj+;
 #pragma link C++ class TCutSet+;
 
+#pragma link C++ class TCutSimple+;
+
 #endif
diff --git a/CutSet/TCutObj.h b/CutSet/TCutObj.h
@@ -10,13 +10,15 @@
 #ifndef ROOT_TCutObj
 #define ROOT_TCutObj
 
-#include "TCut.h"
+#include <TCut.h>
 
 class TCutObj : public TCut {
 
 public:
-   TCutObj(const char *name = "Task", const char *title = "Task");
+   TCutObj(const char *name = "cut", const char *title = "Cut Title");
    virtual ~TCutObj();
+
+   virtual Bool_t IsSelected(TObject*obj) { return kTRUE; }
 private:
    ClassDef(TCutObj, 1)
 };
diff --git a/CutSet/TCutSet.cxx b/CutSet/TCutSet.cxx
@@ -7,16 +7,22 @@
 //          Martin Vala (martin.vala@cern.ch)
 //
 
+#include <TFormula.h>
+#include <TObjArray.h>
+#include "TCutObj.h"
+
 #include "TCutSet.h"
 
 ClassImp(TCutSet)
 
 //_________________________________________________________________________________________________
 TCutSet::TCutSet(const char *name, const char *title) :
-   TCut(name, title)
-   //
-   // Std constructor
-   //
+TCutObj(name, title),
+fCuts(0),
+fFormula(0)
+//
+// Std constructor
+//
 {
 }
 
@@ -25,5 +31,71 @@ TCutSet::~TCutSet() {
    //
    // Destructor
    //
+   delete fFormula;
+   delete fCuts;
+}
+
+//______________________________________________________________________________
+TCutSet& TCutSet::operator=(const TCutSet& rhs)
+{
+   // Assignment.
+
+   if (this != &rhs) TCut::operator=(rhs);
+   delete fFormula;
+   fFormula = new TFormula(TString::Format("formula_%s",GetName()).Data(),GetTitle());
+   return *this;
+}
+
+//______________________________________________________________________________
+TCutSet& TCutSet::operator=(const char *rhs)
+{
+   // Assignment.
+
+   fTitle = rhs;
+   delete fFormula;
+   fFormula = new TFormula(TString::Format("formula_%s",GetName()).Data(),GetTitle());
+   return *this;
+}
+
+//_________________________________________________________________________________________________
+void TCutSet::AddCut(TCutObj *cut) {
+
+   // check for non zero pointer of cut
+   if (!cut) return;
+
+   // creates array of cuts when not done yet
+   if (!fCuts) fCuts = new TObjArray();
+
+   // sets title to parameter id
+   cut->SetTitle(TString::Format("[%d]",fCuts->GetEntries()).Data());
+
+   // adding cut
+   fCuts->Add(cut);
 }
 
+//_________________________________________________________________________________________________
+void TCutSet::AddCut(TCutObj &cut) {
+
+   // creates array of cuts when not done yet
+   if (!fCuts) fCuts = new TObjArray();
+
+   // sets title to parameter id
+   cut.SetTitle(TString::Format("[%d]",fCuts->GetEntries()).Data());
+
+   // adding cut
+   fCuts->Add(&cut);
+}
+
+//_________________________________________________________________________________________________
+Bool_t TCutSet::IsSelected(TObject*obj) {
+
+   TCutObj *cut;
+   for (Int_t i=0;i<fCuts->GetEntries();i++) {
+      cut = (TCutObj*)fCuts->At(i);
+      Printf("%s=%d",cut->GetName(),cut->IsSelected(obj));
+      fFormula->SetParameter(i,cut->IsSelected(obj));
+   }
+
+   Printf("fFormula : %s",fFormula->GetExpFormula("p").Data());
+   return fFormula->Eval(0);
+}
diff --git a/CutSet/TCutSet.h b/CutSet/TCutSet.h
@@ -10,14 +10,32 @@
 #ifndef ROOT_TCutSet
 #define ROOT_TCutSet
 
-#include "TCut.h"
+#include "TCutObj.h"
 
-class TCutSet : public TCut {
+class TFormula;
+class TObjArray;
+class TCutObj;
+class TCutSet : public TCutObj {
 
 public:
-   TCutSet(const char *name = "Task", const char *title = "Task");
+   TCutSet(const char *name = "cutSet", const char *title = "Cut Set Title");
    virtual ~TCutSet();
+
+   TCutSet&    operator=(const TCutSet& rhs);
+   TCutSet&    operator=(const char *rhs);
+
+   void AddCut(TCutObj*cut);
+   void AddCut(TCutObj&cut);
+
+   virtual Bool_t IsSelected(TObject*obj);
+
+   TFormula *GetFormula() { return fFormula; }
+
 private:
+
+   TObjArray    *fCuts;    // list of cuts
+   TFormula     *fFormula; // common formula
+
    ClassDef(TCutSet, 1)
 };
 
diff --git a/CutSet/TCutSimple.cxx b/CutSet/TCutSimple.cxx
@@ -0,0 +1,33 @@
+//
+// Class TCutSimple
+//
+// TODO
+//
+// authors:
+//          Martin Vala (martin.vala@cern.ch)
+//
+
+#include "TCutSimple.h"
+
+ClassImp(TCutSimple)
+
+//_________________________________________________________________________________________________
+TCutSimple::TCutSimple(const char *name, const char *title) :
+TCutObj(name, title)
+//
+// Std constructor
+//
+{
+}
+
+//_________________________________________________________________________________________________
+Bool_t TCutSimple::IsSelected(TObject *obj) {
+
+  TNamed *namedObj = (TNamed*) obj;
+  TString ret = namedObj->GetTitle();
+  
+  if (ret.Contains("1")) return kTRUE;
+
+  return kFALSE;
+}
+
diff --git a/CutSet/TCutSimple.h b/CutSet/TCutSimple.h
@@ -0,0 +1,25 @@
+//
+// Class TCutSimple
+//
+// TODO
+//
+// authors:
+//          Martin Vala (martin.vala@cern.ch)
+//
+
+#ifndef ROOT_TCutSimple
+#define ROOT_TCutSimple
+
+#include "TCutObj.h"
+
+class TCutSimple : public TCutObj {
+
+public:
+   TCutSimple(const char *name = "cut", const char *title = "Cut Title");
+
+   virtual Bool_t IsSelected(TObject*obj);
+
+   ClassDef(TCutSimple, 1)
+};
+
+#endif
diff --git a/macros/TestCutSet.C b/macros/TestCutSet.C
@@ -1,3 +1,27 @@
 void TestCutSet() {
 
+  gSystem->Load("lib/libCutSet.so");
+
+  TCutSet cs("MyCutSet","");
+//  TCutObj c1("c1","");
+  TCutObj c2("c2","");
+
+  TCutSimple c1("c1","");
+//  TCutSimple c2("c2","");
+
+  TNamed *mySimpleObj = new TNamed("myObj","My1");
+
+//  cs.AddCut(&c1);
+//  cs.AddCut(&c2);
+  cs.AddCut(c1);
+  cs.AddCut(c2);
+  
+  cs = c1&&c2;
+
+  cs.Print();
+  
+//  TFormula *f = cs.GetFormula();
+  Printf("MyFormula1 : %d",(Bool_t)cs.IsSelected(mySimpleObj));
+//  Printf("MyFormula1 : %d",(Bool_t)cs.IsSelected(new TObject()));
+
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`set(SRCS`
`3`	`3`	`TCutObj.cxx`
`4`	`4`	`TCutSet.cxx`
	`5`	`+TCutSimple.cxx`
`5`	`6`	`)`
`6`	`7`
`7`	`8`	`set(INCLUDE_DIRECTORIES`