Changeset 5204 for trunk/MagicSoft/Mars

Timestamp:

10/08/04 00:14:54 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mpedestal/MPedCalcFromLoGain.cc (modified) (5 diffs)
• mpedestal/MPedCalcPedRun.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
       MHCalibrationChargeCam which behaved fine until now. 
 
+  * mpedestal/MPedCalcFromLoGain.cc
+    - fixed the case that a window size of 1. is handed over which 
+      previously set the window size to the next smaller even number, 
+      which is 0. Now, it sets it to 2. This makes this class usable 
+      together with the amplitude spline.
+       
 
  2004/10/06: Hendrik Bartko

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -268 +268 @@
 void MPedCalcFromLoGain::SetWindowSize(Byte_t windowh, Byte_t windowl)
 {
+
     fWindowSizeHiGain = windowh & ~1;
     fWindowSizeLoGain = windowl & ~1;
@@ -284 +285 @@
         *fLog << int(fWindowSizeLoGain) << " samples " << endl;
     }
-      
+
+    if (fWindowSizeHiGain == 0)
+    {
+        *fLog << warn;
+        *fLog << GetDescriptor() << ": HiGain window currently set to 0, will set it to 2 samples ";
+        fWindowSizeHiGain = 2;
+    }
+    
+    if (fWindowSizeLoGain == 0)
+    {
+        *fLog << warn;
+        *fLog << GetDescriptor() << ": LoGain window currently set to 0, will set it to 2 samples ";
+        fWindowSizeLoGain = 2;
+    }
+    
     const Byte_t availhirange = (fHiGainLast-fHiGainFirst+1) & ~1;
     const Byte_t availlorange = (fLoGainLast-fLoGainFirst+1) & ~1;
@@ -431 +446 @@
     if (fWindowSizeLoGain==0)
     {
-        *fLog << err << "ERROR - HiGain windows size == 0... abort." << endl;
+        *fLog << err << "ERROR - LoGain windows size == 0... abort." << endl;
         return kFALSE;
     }
@@ -564 +579 @@
 
     if (fPedestalUpdate)
-    {
-        //fPedestals->ReCalc(*fGeom);
-        fPedestals->SetReadyToSave();
-    }
+      fPedestals->SetReadyToSave();
 
     return kTRUE;
@@ -598 +610 @@
 
     fPedestals->SetTotalEntries((UInt_t)(sum/npix*(fWindowSizeLoGain+fWindowSizeHiGain)));
+    fPedestals->SetReadyToSave();
     fPedestals->ReCalc(*fGeom);
-    fPedestals->SetReadyToSave();
     return kTRUE;
 }

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -237 +237 @@
           << int(fWindowSizeLoGain) << " samples " << endl;
     
+
+    if (fWindowSizeHiGain == 0)
+    {
+        *fLog << warn;
+        *fLog << GetDescriptor() << ": HiGain window currently set to 0, will set it to 2 samples ";
+        fWindowSizeHiGain = 2;
+    }
+    
+    if (fWindowSizeLoGain == 0)
+    {
+        *fLog << warn;
+        *fLog << GetDescriptor() << ": LoGain window currently set to 0, will set it to 2 samples ";
+        fWindowSizeLoGain = 2;
+    }
+
   const Byte_t availhirange = (fHiGainLast-fHiGainFirst+1) & ~1;
   const Byte_t availlorange = (fLoGainLast-fLoGainFirst+1) & ~1;