Changeset 6604 for trunk/MagicSoft/Mars/mjobs

Timestamp:

02/18/05 16:29:20 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (5 diffs)
• MSequence.cc (modified) (3 diffs)
• MSequence.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -88 +88 @@
 #include "MFTriggerPattern.h"
 #include "MGeomApply.h"
-#include "MMcPedestalCopy.h"
+//#include "MMcPedestalCopy.h"
 #include "MPointingPosCalc.h"
 #include "MPointingPosInterpolate.h"
@@ -456 +456 @@
     contcos.SetInverted();
 
-    MMcPedestalCopy pcopy;
+    //MMcPedestalCopy pcopy;
     MTaskEnv taskenv1("ExtractSignal");
     MTaskEnv taskenv2("ExtractTime");
@@ -472 +472 @@
     calib.SetSignalType(MCalibrateData::kPhe);
     //----- WORKAROUND: Currently MC has no lo-gain switch ------
-    if (IsUseMC()) // MC file
-    {
-        calib.SetCalibrationMode(MCalibrateData::kFfactor);
-        calib.SetPedestalFlag(MCalibrateData::kRun);
-        // FIXME: What to do for MC files???
-        calib.AddPedestal("MPedestalCam", "MPedPhotFundamental");
-        calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractor");
-        calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractorRndm");
-    }
-    else
-    {
+    //if (IsUseMC()) // MC file
+    //{
+    //    calib.SetCalibrationMode(MCalibrateData::kFfactor);
+    //    calib.SetPedestalFlag(MCalibrateData::kRun);
+    //    // FIXME: What to do for MC files???
+    //    calib.AddPedestal("MPedestalCam", "MPedPhotFundamental");
+    //    calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractor");
+    //    calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractorRndm");
+    //}
+    //else
+    //{
         calib.AddPedestal("Fundamental");
         calib.AddPedestal("FromExtractor");
         calib.AddPedestal("FromExtractorRndm");
         calib.SetPedestalFlag(MCalibrateData::kEvent);
-    }
+    //}
     //----------------------------------------------------------
 
@@ -624 +624 @@
     tlist2.AddToList(&merge);
     //----- WORKAROUND: Currently MC has no lo-gain switch ------
-    if (IsUseMC())
-        tlist2.AddToList(&pcopy);
-    else
-    {
+    //if (IsUseMC())
+    //    tlist2.AddToList(&pcopy);
+    //else
+    //{
         tlist2.AddToList(&pedlo1);
         tlist2.AddToList(&pedlo2);
         tlist2.AddToList(&pedlo3);
-    }
+    //}
     //-----------------------------------------------------------
     if (fIsInterlaced)
@@ -718 +718 @@
 
     // Print statistics
-    tlist.PrintStatistics();
+    if (read->GetNumExecutions()>0)
+        tlist.PrintStatistics();
 
     // make sure owned object are deleted

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -130 +130 @@
 
 #include "MAstro.h"
+#include "MString.h"
 #include "MDirIter.h"
 
@@ -172 +173 @@
 }
 
+const TString MSequence::GetStandardPath(Bool_t raw) const
+{
+    TString d = MString::Form("/data/MAGIC/Period%03d/", fPeriod);
+    d += raw ? "rawdata/" : "rootdata/";
+    return d;
+}
+
 UInt_t MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, char *id, Bool_t raw) const
 {
@@ -179 +187 @@
     if (d.IsNull())
     {
-        d  = Form("/data/MAGIC/Period%03d/", fPeriod);
-        d += raw ? "rawdata/" : "rootdata/";
+        d = GetStandardPath(raw);
         d += fNight.GetStringFmt("%Y_%m_%d");
     }

trunk/MagicSoft/Mars/mjobs/MSequence.h

@@ -93 +93 @@
     const TString &GetSource() const { return fSource; } 
 
+    const TString GetStandardPath(Bool_t raw) const;
+
     // Setter
     void SetNight(const char*night);