Changeset 6091 for trunk

Timestamp:

01/28/05 16:31:09 (20 years ago)

Author:

mazin

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• callisto.rc (modified) (1 diff)
• mcalib/MCalibrateData.cc (modified) (5 diffs)
• mcalib/MCalibrateData.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -98 +98 @@
      - fill MCalibConstCam with update results (once per calib. consts
        update == every 10 sec.)
+     - introduce check for size of calibration constant. In case, it is 
+       completetly out of range, set the MBadPixelsPix::IsUnsuitableRun
 
    * mjobs/MJCalibrateSignal.cc:

trunk/MagicSoft/Mars/callisto.rc

@@ -303 +303 @@
 #MJCalibrateSignal.MCalibrateData.PedestalFlag: Event
 #MJCalibrateSignal.MCalibrateData.CalibrationMode: Default
+#MJCalibrateSignal.MCalibrateData.CalibConvMinLimit: 0.01
+#MJCalibrateSignal.MCalibrateData.CalibConvMaxLimit: 5.
 MJCalibrateSignal.Interlaced: yes
 #MJCalibrateSignal.RelTimesUpdate: no

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -135 +135 @@
 using namespace std;
 
+const Float_t MCalibrateData::fgCalibConvMinLimit = 0.01;
+const Float_t MCalibrateData::fgCalibConvMaxLimit = 5.;
 // --------------------------------------------------------------------------
 //
@@ -155 +157 @@
   
   SetCalibrationMode(calmode);
+  
+  SetCalibConvMinLimit();
+  SetCalibConvMaxLimit();
 
   fNamesPedestal.SetOwner();
@@ -477 +482 @@
         if(fCalibrationMode!=kNone)
           {
-            if ((*fBadPixels)[pixidx].IsUnsuitable())
+            if ((*fBadPixels)[pixidx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
               {
                 skip++;
+                calibConv = -1.;
                 continue;
-              }
+             }
             
             MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*fCalibrations)[pixidx];
@@ -604 +610 @@
         fCalibFFactors[pixidx] = calibFFactor;
 
+        if (calibConv < fCalibConvMinLimit || calibConv > fCalibConvMaxLimit)
+          {
+            (*fBadPixels)[pixidx].SetUnsuitable(MBadPixelsPix::kUnsuitableRun);  
+            cpix.SetCalibConst(-1.);
+            cpix.SetCalibFFactor(-1.);
+            continue;
+          }
+        
         cpix.SetCalibConst(calibConv);
         cpix.SetCalibFFactor(calibFFactor);
@@ -819 +833 @@
     }
 
+    if (IsEnvDefined(env, prefix, "CalibConvMinLimit", print))
+    {
+        fCalibConvMinLimit = GetEnvValue(env, prefix, "CalibConvMinLimit", fCalibConvMinLimit);
+        rc = kTRUE;
+    }
+
+    if (IsEnvDefined(env, prefix, "CalibConvMaxLimit", print))
+    {
+        fCalibConvMaxLimit = GetEnvValue(env, prefix, "CalibConvMaxLimit", fCalibConvMaxLimit);
+        rc = kTRUE;
+    }
+
     return rc;
 }

trunk/MagicSoft/Mars/mcalib/MCalibrateData.h

@@ -39 +39 @@
 private:
 
+  static const Float_t  fgCalibConvMinLimit; //! Minimum limit for conv. factor
+  static const Float_t  fgCalibConvMaxLimit; //! Maximum limit for conv. factor
+
+  Float_t  fCalibConvMinLimit;           // Minimum limit for conv. factor
+  Float_t  fCalibConvMaxLimit;           // Maximum limit for conv. factor
+    
   MGeomCam              *fGeomCam;       //! Camera geometry container
   MBadPixelsCam         *fBadPixels;     //! Bad Pixels information
@@ -117 +123 @@
   void   SetSignalType      ( SignalType_t      sigtype=kPhot    ) { fSignalType     =sigtype; }  
 
+  void   SetCalibConvMinLimit( const Float_t f=fgCalibConvMinLimit ) { fCalibConvMinLimit = f; }
+  void   SetCalibConvMaxLimit( const Float_t f=fgCalibConvMaxLimit ) { fCalibConvMaxLimit = f; }
+    
   Bool_t UpdateConversionFactors( const MCalibrationChargeCam *updatecam=NULL);