Changeset 6569 for trunk/MagicSoft/Mars/mjobs

Timestamp:

02/17/05 17:09:00 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalib.cc (modified) (2 diffs)
• MJCalibrateSignal.cc (modified) (6 diffs)
• MJPedestal.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalib.cc

@@ -37 +37 @@
 
 const Int_t MJCalib::fgCheckedPixId = 100;
+
 // --------------------------------------------------------------------------
 //
@@ -54 +55 @@
 Bool_t MJCalib::CheckEnvLocal()
 {
-
     if (HasEnv("PixelCheck"))
-      SetPixelCheck();
+        SetPixelCheck(GetEnv("PixelCheck", fPixelCheck));
 
     if (HasEnv("CheckedPixId"))
-      SetCheckedPixId(GetEnv("CheckedPixId",fCheckedPixId));
+        SetCheckedPixId(GetEnv("CheckedPixId",fCheckedPixId));
 
     if (!HasEnv("DataType"))

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -464 +464 @@
     taskenv3.SetDefault(extractor3);
 
-    MCalibrateData         calib;
     // 
     // This is new calibration to eff. photo-electrons, hard-coded as decided 
@@ -470 +469 @@
     //
 #warning Default calibration now in equiv. photo-electrons!
+    MCalibrateData calib;
     calib.SetSignalType(MCalibrateData::kPhe);
-
+    //----- WORKAROUND: Currently MC has no lo-gain switch ------
     if (IsUseMC()) // MC file
     {
@@ -488 +488 @@
         calib.SetPedestalFlag(MCalibrateData::kEvent);
     }
+    //----------------------------------------------------------
 
     MExtractPINDiode        pinext;
@@ -621 +622 @@
     tlist2.AddToList(&apply);
     tlist2.AddToList(&merge);
+    //----- WORKAROUND: Currently MC has no lo-gain switch ------
     if (IsUseMC())
         tlist2.AddToList(&pcopy);
@@ -629 +631 @@
         tlist2.AddToList(&pedlo3);
     }
+    //-----------------------------------------------------------
     if (fIsInterlaced)
-      {
+    {
         pinext.SetFilter(&fcalib);
         bldext.SetFilter(&fcalib);
@@ -655 +658 @@
         if (fIsRelTimesUpdate)
           tlist2.AddToList(&recalc);
-      }
+    }
 
     tlist2.AddToList(&conttp);

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -791 +791 @@
     
     if (HasEnv("UseData"))
-      fExtractType = GetEnv("UseData",kFALSE) ? kUseData : kUsePedRun;
+        fExtractType = GetEnv("UseData",kFALSE) ? kUseData : kUsePedRun;
+
+    if (IsUseMC() && fExtractType==kUseData)
+    {
+        // The reason is, that the standard data files contains empty
+        // (untriggered) events. If we would loop over the default 500
+        // first events of the data file you would calculate the
+        // pedestal from only some single events...
+        *fLog << inf;
+        *fLog << "Sorry, you cannot extract the starting pedestal from the first" << endl;
+        *fLog << "events in your data files... using pedestal file instead.  The" << endl;
+        *fLog << "result should not differ..." << endl;
+        fExtractType = kUsePedRun;
+    }
+
 
     if (HasEnv("UseHists"))
@@ -1002 +1016 @@
     
     if (fIsUseHists)
-      {
+    {
         pedcalc.SetIntermediateStorage();
         pedlogain.SetIntermediateStorage();
@@ -1009 +1023 @@
         //        plist.AddToList(&fPedestalHist);
         tlist.AddToList(&fillped);
-      }
+    }
 
     pedcalc.SetPedestalsIn(&fPedestalCamIn);
     pedlogain.SetPedestalsIn(&fPedestalCamIn);
+
     pedcalc.SetPedestalsInter(&pedinter);
     pedlogain.SetPedestalsInter(&pedinter);
@@ -1135 +1150 @@
         DisplayResult(plist);
 
-    if (fExtractionType!=kFundamental)
-      fExtractor->SetFilter(0);
-
     if (!WriteResult())
         return kFALSE;