Changeset 3116 for trunk

Timestamp:

02/12/04 12:44:04 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrate.cc (modified) (2 diffs)
• mcalib/MCalibrationCalc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -11 +11 @@
    * mcalib/MHGausEvent.cc:
      - corrected call to StripZeros
+
+   * mcalib/MCalibrationPix.[h,cc]
+     - implemented dummy for combined method
+
+   * mcalib/MCalibrate.[h,cc]
+     - implemented a dummy for calibration factor 1. 
+       (requested by Javier Rico)
+     - implemented combined method
+     - check for valid methods moved to ReInit
+
+   * mcalib/MCalibrationCalc.cc
+     - removed initialization of non-used nsamples
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -135 +135 @@
     }
 
+  switch(fCalibrationMode)
+    {
+    case kBlindPixel:
+      break;
+    case kFfactor:
+      break;
+    case kPinDiode:
+      *fLog << err << GetDescriptor() 
+                    << ": PIN Diode Calibration mode not yet available " << endl;
+      return kFALSE;
+      break;
+    case kCombined:
+      *fLog << err << GetDescriptor() 
+                    << ": Combined Calibration mode not yet available " << endl;
+      return kFALSE;
+      break;
+    case kDummy:
+      *fLog << warn << GetDescriptor() 
+                    << ": WARNING: Dummy calibration, no calibration applied!!" << endl;
+      break;
+    default:
+      *fLog << warn << GetDescriptor() 
+            << ": WARNING: Calibration mode value ("
+            <<fCalibrationMode<<") not known" << endl;
+      return kFALSE;
+    }
+  
   return kTRUE;
 }
@@ -181 +208 @@
               calibrationConversionFactorError = pix.GetErrorConversionBlindPixelMethod();
               break;
+            case kPinDiode:
+              calibrationConversionFactor      = pix.GetMeanConversionPINDiodeMethod();
+              calibrationConversionFactorError = pix.GetErrorConversionPINDiodeMethod();
+              break;
             case kFfactor:
               calibrationConversionFactor      = pix.GetMeanConversionFFactorMethod();
               calibrationConversionFactorError = pix.GetErrorConversionFFactorMethod();
               break;
-            default:
-              *fLog << warn << "MCalibrate::Process Warning: Calibration mode value ("<<fCalibrationMode<<") not known" << endl;
-              break;
+            case kCombined:
+              calibrationConversionFactor      = pix.GetMeanConversionCombinedMethod();
+              calibrationConversionFactorError = pix.GetErrorConversionCombinedMethod();
+              break;
+            case kDummy:
+              calibrationConversionFactor      = 1.;
+              calibrationConversionFactorError = 0.;
+              break;
             }
         }

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -527 +527 @@
               blindpixel.FillGraphs(blindpixelsumhi,blindpixelsumlo);
           
-#if 0              
               TH1I *hist = blindpixel.GetSinglePheFADCSlices();
 
-              if (blindpixelsumhi > 300.)
+              if (blindpixelsumhi > 50.)
                 {
                   ptr = pixel.GetHiGainSamples();
@@ -539 +538 @@
                     hist->Fill(i,*ptr++);
                 }
-#endif              
             } /* if use blind pixel */
           
@@ -786 +784 @@
   Byte_t *start   = ptr + fBlindPixelFirst-1;
   Byte_t *end     = ptr + fBlindPixelLast;
-  Byte_t nsamples = fBlindPixelLast-fgBlindPixelFirst+1;
 
   Byte_t sum = 0;