Changeset 8369

Timestamp:

03/05/07 09:44:55 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• callisto_mux.rc (added)
• mjobs/MJCalib.cc (modified) (2 diffs)
• mjobs/MJCalib.h (modified) (2 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (2 diffs)
• mjobs/MJPedestal.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/03/05 Thomas Bretz
+
+   * msignal/MExtractTimeAndChargeSpline.cc:
+     - added a default for the extrator resolution in case no predefined
+       value is set
+
+   * mjobs/MJCalib.[h,cc], mjobs/MJCalibration.cc:
+     - removed HiLoCalibration option
+
+   * mjobs/MJCalibration.cc:
+     - use extractor to determine hi-/lo-calibration
+
+   * mjobs/MJPedestal.cc:
+     - do only insist on pedestal events if an extractor without
+       lo-gains is set
+
+
+
+
  2007/03/04 Thomas Bretz
 

trunk/MagicSoft/Mars/mjobs/MJCalib.cc

@@ -49 +49 @@
 //
 MJCalib::MJCalib() : fDataFlag(kIsUseRawData), fStorage(0),
-                     fIsPixelCheck(kFALSE), fIsPulsePosCheck(kFALSE),
-                     fIsHiLoCalibration(kFALSE)
+                     fIsPixelCheck(kFALSE), fIsPulsePosCheck(kFALSE)/*,
+                     fIsHiLoCalibration(kFALSE)*/
 {
   SetUseBlindPixel(kFALSE);
@@ -63 +63 @@
     SetPulsePosCheck(GetEnv("PulsePosCheck", fIsPulsePosCheck));
     SetCheckedPixId(GetEnv("CheckedPixId",fCheckedPixId));
-    SetHiLoCalibration(GetEnv("HiLoCalibration", fIsHiLoCalibration));
+    //SetHiLoCalibration(GetEnv("HiLoCalibration", fIsHiLoCalibration));
 
     if (HasEnv("StorageType"))

trunk/MagicSoft/Mars/mjobs/MJCalib.h

@@ -46 +46 @@
 
     Bool_t fIsPulsePosCheck;            // Check pulse position?
-    Bool_t fIsHiLoCalibration;          // Choose to calibrate the high-gain vs. low-gains
+    //Bool_t fIsHiLoCalibration;          // Choose to calibrate the high-gain vs. low-gains
     
     Bool_t CheckEnvLocal();
@@ -76 +76 @@
     void SetHistsStorage ( const Bool_t b=kTRUE ) { b ? SETBIT(fStorage,kHistsStorage) : CLRBIT(fStorage,kHistsStorage); }
 
-    void SetHiLoCalibration( const Bool_t b=kTRUE )  { fIsHiLoCalibration = b; }
+    //void SetHiLoCalibration( const Bool_t b=kTRUE )  { fIsHiLoCalibration = b; }
     void SetPixelCheck     ( const Bool_t b=kTRUE )  { fIsPixelCheck        = b; }
     void SetPulsePosCheck  ( const Bool_t b=kTRUE )  { fIsPulsePosCheck     = b; }

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -856 +856 @@
 void MJCalibrateSignal::DisplayResult(MParList &plist)
 {
+    /*
     if (!fDisplay || !fIsHiLoCalibration)
         return;
-    /*
+
     MCalibrationHiLoCam *hcam = (MCalibrationHiLoCam*)plist.FindObject("MCalibrationHiLoCam");
     MGeomCam            *geom = (MGeomCam*)plist.FindObject("MGeomCam");

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -207 +207 @@
   fTitle = title ? title : "Tool to create the calibration constants for one calibration run";
   
-  SetHiLoCalibration();
+  //SetHiLoCalibration();
   SetRelTimeCalibration();
   SetDebug(kFALSE);
@@ -1471 +1471 @@
 Bool_t MJCalibration::ReadHiLoCalibFile()
 {
-    if (!fIsHiLoCalibration)
+    if (fExtractor && !fExtractor->HasLoGain())
         return kTRUE;
+
+//    if (!fIsHiLoCalibration)
+//        return kTRUE;
 
     // We use the night time stamp to determine the period

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -1141 +1141 @@
     ftp2.SetDefault(kTRUE);
     ftp2.DenyCalibration();
-//    ftp2.RequirePedestal();
-
-    if (!IsUseMC())
+    ftp2.RequirePedestal();
+
+    if (!IsUseMC() && (!fExtractor || !fExtractor->HasLoGain()))
     {
         taskenv.SetFilter(&ftp2);