Changeset 7115 for trunk/MagicSoft/Mars/mjobs

Timestamp:

05/31/05 11:53:09 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalib.cc (modified) (1 diff)
• MJCalibrateSignal.cc (modified) (5 diffs)
• MJCut.cc (modified) (2 diffs)
• MJStar.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalib.cc

@@ -60 +60 @@
 Bool_t MJCalib::CheckEnvLocal()
 {
-    if (HasEnv("PixelCheck"))
-        SetPixelCheck(GetEnv("PixelCheck", fIsPixelCheck));
-
-    if (HasEnv("PulsePosCheck"))
-        SetPulsePosCheck(GetEnv("PulsePosCheck", fIsPulsePosCheck));
-
-    if (HasEnv("CheckedPixId"))
-        SetCheckedPixId(GetEnv("CheckedPixId",fCheckedPixId));
-
-    if (HasEnv("HiLoCalibration"))    
-      SetHiLoCalibration(GetEnv("HiLoCalibration", fIsHiLoCalibration));
+    SetPixelCheck(GetEnv("PixelCheck", fIsPixelCheck));
+    SetPulsePosCheck(GetEnv("PulsePosCheck", fIsPulsePosCheck));
+    SetCheckedPixId(GetEnv("CheckedPixId",fCheckedPixId));
+    SetHiLoCalibration(GetEnv("HiLoCalibration", fIsHiLoCalibration));
 
     if (HasEnv("StorageType"))

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -95 +95 @@
 //#include "MMcPedestalCopy.h"
 #include "MPointingPosCalc.h"
-#include "MPointingPosInterpolate.h"
 #include "MPedCalcFromLoGain.h"
 #include "MExtractor.h"
@@ -378 +377 @@
 
     MReadReports readreal;
-    readreal.AddTree("Events", "MTime.", kTRUE);
+    readreal.AddTree("Events", "MTime.", MReadReports::kMaster);
     readreal.AddTree("Trigger");
     readreal.AddTree("Camera");
@@ -407 +406 @@
     MContinue contmc("MRawEvtData.GetNumPixels<0.5", "ContEmptyMC");
 
-    MPointingPosInterpolate pextr;
-    pextr.AddFiles(&iter);
+    //MPointingPosInterpolate pextr;
+    //pextr.AddFiles(&iter);
     
     MGeomApply             apply; // Only necessary to create geometry
@@ -725 +724 @@
     // Now setup main tasklist
     tlist.AddToList(read);
+
     if (IsUseMC())
     {
@@ -731 +731 @@
     }
 
-    if (IsUseRootData())
-      tlist2.AddToList(&pextr);
+    //if (IsUseRootData())
+    //  tlist2.AddToList(&pextr);
     tlist.AddToList(&tlist2, IsUseRootData() ? "Events" : "All");
 

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -494 +494 @@
     // ------------- Loop Off Data --------------------
     MReadReports readoffdata;
-    readoffdata.AddTree("Events", "MTime.", kTRUE);
-    readoffdata.AddTree("Drive");
+    readoffdata.AddTree("Events", "MTime.", MReadReports::kMaster);
+    readoffdata.AddTree("Drive", MReadReports::kRequired);
     readoffdata.AddTree("EffectiveOnTime");
 
@@ -637 +637 @@
     // ------------- Loop On Data --------------------
     MReadReports readondata;
-    readondata.AddTree("Events", "MTime.", kTRUE);
-    readondata.AddTree("Drive");
+    readondata.AddTree("Events", "MTime.", MReadReports::kMaster);
+    readondata.AddTree("Drive", MReadReports::kRequired);
     readondata.AddTree("EffectiveOnTime");
 

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -191 +191 @@
 
     MReadReports readreal;
-    readreal.AddTree("Events", "MTime.", kTRUE);
-    readreal.AddTree("Drive");
+    readreal.AddTree("Events", "MTime.", MReadReports::kMaster);
+    readreal.AddTree("Drive", MReadReports::kRequired);
     readreal.AddTree("CC");
     //read.AddTree("Trigger");
@@ -368 +368 @@
     if (!ismc)
     {
-        tlist2.AddToList(&rate,   "Events");
-        tlist2.AddToList(&fillvs, "Events");
-        tlist2.AddToList(&fill8,  "Events");
-        tlist2.AddToList(&fill9,  "Events");
+        // Calibration events don't enter star at all.
+        tlist2.AddToList(&rate);
+        tlist2.AddToList(&fillvs);
+        tlist2.AddToList(&fill8);
+        tlist2.AddToList(&fill9);
     }
     //tlist2.AddToList(&fillb);