Changeset 7413 for trunk/MagicSoft/Mars/mjobs

Timestamp:

11/21/05 11:09:12 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MDataSet.cc (modified) (1 diff)
• MDataSet.h (modified) (1 diff)
• MJCut.cc (modified) (5 diffs)
• MJCut.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -196 +196 @@
     fName  = fname;
 
+    fSequencesOn.SetOwner();
+    fSequencesOff.SetOwner();
+
     const char *expname = gSystem->ExpandPathName(fname);
 

trunk/MagicSoft/Mars/mjobs/MDataSet.h

@@ -54 +54 @@
 
 public:
-    MDataSet() : fNumAnalysis((UInt_t)-1) { }
+    MDataSet(Int_t num=(UInt_t)-1) : fNumAnalysis(num) { }
     MDataSet(const char *fname, TString sequences="", TString data="");
+
+    void Copy(TObject &obj) const
+    {
+        MDataSet &ds = (MDataSet&)obj;
+        ds.fNumAnalysis = fNumAnalysis;
+        ds.fNumSequencesOn = fNumSequencesOn;
+        ds.fNumSequencesOff = fNumSequencesOff;
+        ds.fNameSource = fNameSource;
+        ds.fCatalog = fCatalog;
+        ds.fComment = fComment;
+        ds.fIsWobbleMode = fIsWobbleMode;
+
+        TObject *o=0;
+
+        ds.fSequencesOn.Delete();
+        ds.fSequencesOff.Delete();
+
+        TIter NextOn(&fSequencesOn);
+        while ((o=NextOn()))
+            ds.fSequencesOn.Add(o->Clone());
+
+        TIter NextOff(&fSequencesOff);
+        while ((o=NextOff()))
+            ds.fSequencesOff.Add(o->Clone());
+    }
 
     // Getter

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -86 +86 @@
     : fStoreSummary(kFALSE), fStoreResult(kTRUE), fWriteOnly(kFALSE),
     fIsWobble(kFALSE), fIsMonteCarlo(kFALSE),  fFullDisplay(kTRUE),
-    fNameHist("MHThetaSq"), fCalcHadronness(0)
+    fNameHist("MHThetaSq"), fCalcHadronness(0), fCalcDisp(0)
 {
     fName  = name  ? name  : "MJCut";
@@ -102 +102 @@
     if (fCalcHadronness)
         delete fCalcHadronness;
+    if (fCalcDisp)
+        delete fCalcDisp;
 }
 
@@ -160 +162 @@
         delete fCalcHadronness;
     fCalcHadronness = task ? (MTask*)task->Clone() : 0;
+}
+
+// --------------------------------------------------------------------------
+//
+// Setup a task calculating disp. The given task is cloned.
+//
+void MJCut::SetDispCalculator(const MTask *task)
+{
+    if (fCalcDisp)
+        delete fCalcDisp;
+    fCalcDisp = task ? (MTask*)task->Clone() : 0;
 }
 
@@ -540 +553 @@
     taskenv2.SetDefault(fCalcHadronness);
 
+    MTaskEnv taskenv3("CalcDisp");
+    taskenv3.SetDefault(fCalcDisp);
+
     MFillH fill1a("MHHillasOffPre  [MHHillas]",      "MHillas",      "FillHillasPre");
     MFillH fill2a("MHHillasOffPost [MHHillas]",      "MHillas",      "FillHillasPost");
@@ -579 +595 @@
     //tlist2.AddToList(&taskenv1);
     tlist2.AddToList(&taskenv2);
+    tlist2.AddToList(&taskenv3);
     tlist2.AddToList(&cont0);
     if (write0)

trunk/MagicSoft/Mars/mjobs/MJCut.h

@@ -33 +33 @@
     //MTask *fEstimateEnergy;
     MTask *fCalcHadronness;
+    MTask *fCalcDisp;
 
     TString  GetOutputFile(UInt_t num) const;
@@ -68 +69 @@
     //void SetEnergyEstimator(const MTask *task=0);
     void SetHadronnessCalculator(const MTask *task=0);
+    void SetDispCalculator(const MTask *task=0);
 
     ClassDef(MJCut, 0) // Standard program to perform g/h-separation cuts