Changeset 6798 for trunk

Timestamp:

03/09/05 12:24:15 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mjobs/hilocalib_sp2.root (deleted)
• mjobs/hilocalib_sp2_Dec04Jan05.root (added)
• msignal/MExtractTimeAndCharge.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/03/09 Markus Gaug
+  
+   * msignal/MExtractTimeAndCharge.cc
+     - catch a (very unprobable) case in which the low-gain range could 
+       be negative
+
  2005/03/09 Thomas Hengstebeck
 
@@ -29 +35 @@
      - changed check of energy rule (last col of MHMatrix) so, that 
        any rule containing "fEnergy" is accepted.
-
 
  2005/03/08 Markus Gaug

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -831 +831 @@
       }
 
+    interlacedcont.Add(&pulcam);
+
+    if (fIsHiLoCalibration)
+      interlacedcont.Add(&hilcam);
+
     if (!WriteResult(interlacedcont))
       return kFALSE;
 
-    TObjArray addcont;
-    addcont.Add(&pulcam);
-
-    if (fIsHiLoCalibration)
-      addcont.Add(&hilcam);
-
-    if (IsHistsStorage())
-      {
-        addcont.Add(plist.FindObject("MHCalibrationHiLoCam"));
-        addcont.Add(plist.FindObject("MHCalibrationPulseTimeCam"));
-      }
+    //    if (IsHistsStorage())
+    //      {
+    //        addcont.Add(plist.FindObject("MHCalibrationHiLoCam"));
+    //        addcont.Add(plist.FindObject("MHCalibrationPulseTimeCam"));
+    //      }
     
-    if (!WriteResult(addcont))
-      return kFALSE;
-
-
     // return if job went ok
     *fLog << all << GetDescriptor() << ": Done." << endl;

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -131 +131 @@
 
   *fLog << flush << inf;
-  Print();
-  
   return kTRUE;
 }
@@ -219 +217 @@
           fLoGainFirstSave = fLoGainFirst;
           const Byte_t logainstart = sathi 
-            ? sathi + (Int_t)fLoGainStartShift
+            ? (sathi > (Int_t)fLoGainStartShift ? sathi + (Int_t)fLoGainStartShift : fLoGainFirst)
             : (Byte_t)(timehi + fLoGainStartShift);
           fLoGainFirst = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;