Changeset 8709 for trunk/MagicSoft/Mars/mjobs

Timestamp:

08/25/07 16:30:26 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCut.cc (modified) (4 diffs)
• MJSpectrum.cc (modified) (7 diffs)
• MJSpectrum.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -697 +697 @@
     SetupWriter(write1, "WriteAfterCut3");
 
-    MTaskEnv taskenv2("CalcHadronness");
-    taskenv2.SetDefault(fCalcHadronness);
-
-    MTaskEnv taskenv3("CalcDisp");
-    taskenv3.SetDefault(fCalcDisp);
-
-    MTaskEnv taskenv4("EstimateEnergy");
-    taskenv4.SetDefault(fEstimateEnergy);
+    MTaskEnv taskenv0("CalcDisp");
+    taskenv0.SetDefault(fCalcDisp);
+
+    MTaskEnv taskenv1("CalcHadronness");
+    taskenv1.SetDefault(fCalcHadronness);
+
+    MTaskEnv taskenv2("EstimateEnergy");
+    taskenv2.SetDefault(fEstimateEnergy);
 
     MParameterCalc setevtnum("MRawEvtHeader.fDAQEvtNumber", "SetEvtNumber");
@@ -788 +788 @@
     if (set.IsWobbleMode())
         tlist2.AddToList(&hcalc2);
-    //tlist2.AddToList(&taskenv1);
     tlist2.AddToList(&cont0);  
-    tlist2.AddToList(&taskenv2);
-    tlist2.AddToList(&taskenv3);
+    tlist2.AddToList(&taskenv0);
+    tlist2.AddToList(&taskenv1);
     tlist2.AddToList(&setrunnum);
     tlist2.AddToList(&setevtnum);
@@ -824 +823 @@
     }
     tlist2.AddToList(&cont3);
-    tlist2.AddToList(&taskenv4);
+    tlist2.AddToList(&taskenv2);
 
     if (write1)
@@ -863 +862 @@
     //if (taskenv1.GetTask())
     //    cont.Add(taskenv1.GetTask());
+    if (taskenv0.GetTask())
+        cont.Add(taskenv0.GetTask());
+    if (taskenv1.GetTask())
+        cont.Add(taskenv1.GetTask());
     if (taskenv2.GetTask())
         cont.Add(taskenv2.GetTask());
-    if (taskenv3.GetTask())
-        cont.Add(taskenv3.GetTask());
 
     if (!WriteTasks(set.GetNumAnalysis(), cont))

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -86 +86 @@
 MJSpectrum::MJSpectrum(const char *name, const char *title)
     : fCutQ(0), fCut0(0),fCut1(0), fCut2(0), fCut3(0), fCutS(0),
-    fEstimateEnergy(0), fCalcHadronness(0),  fForceTheta(kFALSE)
+    fEstimateEnergy(0), fCalcHadronness(0),  fCalcDisp(0), fForceTheta(kFALSE)
 {
     fName  = name  ? name  : "MJSpectrum";
@@ -118 +118 @@
     if (fCalcHadronness)
         delete fCalcHadronness;
+    if (fCalcDisp)
+        delete fCalcDisp;
 }
 
@@ -261 +263 @@
         return -1;
     if (!ReadTask(fCalcHadronness, "CalcHadronness", kFALSE))
+        return -1;
+    if (!ReadTask(fCalcDisp,       "CalcDisp",       kFALSE))
         return -1;
 
@@ -664 +668 @@
     read.DisableAutoScheme();
     read.AddFile(fPathIn);
-
-    MTaskEnv taskenv0("CalcHadronness");
-    taskenv0.SetDefault(fCalcHadronness);
-
+/*
+    MTaskEnv taskenv0("CalcDisp");
+    taskenv0.SetDefault(fCalcDisp);
+
+    MTaskEnv taskenv1("CalcHadronness");
+    taskenv1.SetDefault(fCalcHadronness);
+ */
     MEnergyEstimate est;
-    MTaskEnv taskenv1("EstimateEnergy");
-    taskenv1.SetDefault(fEstimateEnergy ? fEstimateEnergy : &est);
+    MTaskEnv taskenv2("EstimateEnergy");
+    taskenv2.SetDefault(fEstimateEnergy ? fEstimateEnergy : &est);
 
     MContinue *cont = new MContinue("", "CutS");
@@ -693 +700 @@
     tlist.AddToList(&read);
     //tlist.AddToList(&taskenv0); // not necessary, stored in file!
+    //tlist.AddToList(&taskenv1); // not necessary, stored in file!
     tlist.AddToList(fCutS);
-    tlist.AddToList(&taskenv1);
+    tlist.AddToList(&taskenv2);
     tlist.AddToList(&f0);
     tlist.AddToList(&f1);
@@ -1560 +1568 @@
     // energy limit!
 
-    MTaskEnv taskenv0("CalcHadronness");
-    taskenv0.SetDefault(fCalcHadronness);
+    MTaskEnv taskenv0("CalcDisp");
+    taskenv0.SetDefault(fCalcDisp);
+
+    MTaskEnv taskenv1("CalcHadronness");
+    taskenv1.SetDefault(fCalcHadronness);
 
     MEnergyEstimate est;
-    MTaskEnv taskenv1("EstimateEnergy");
-    taskenv1.SetDefault(fEstimateEnergy ? fEstimateEnergy : &est);
+    MTaskEnv taskenv2("EstimateEnergy");
+    taskenv2.SetDefault(fEstimateEnergy ? fEstimateEnergy : &est);
 
     tlist2.AddToList(&read);
@@ -1582 +1593 @@
     tlist2.AddToList(fCut0);
     tlist2.AddToList(&taskenv0);
+    tlist2.AddToList(&taskenv1);
     tlist2.AddToList(fCut1);
     tlist2.AddToList(fCutS);
     tlist2.AddToList(fCut2);
     tlist2.AddToList(fCut3);
-    tlist2.AddToList(&taskenv1);
+    tlist2.AddToList(&taskenv2);
     tlist2.AddToList(&fill31);
     tlist2.AddToList(&fill4);

trunk/MagicSoft/Mars/mjobs/MJSpectrum.h

@@ -33 +33 @@
     MTask *fEstimateEnergy;
     MTask *fCalcHadronness;
+    MTask *fCalcDisp;
 
     Bool_t fForceTheta;