Changeset 6199 for trunk/MagicSoft/Mars

Timestamp:

02/02/05 12:52:00 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrateData.cc (modified) (1 diff)
• mjobs/MJCalibTest.cc (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
 
  2005/02/02 Markus Gaug
+
+   * mcalib/MCalibrateData.cc
+     - catch the case in which no interlaced cal. events are being sent
+       by the pulser box.
 
    * mjobs/MJCalib.[h,cc]

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -513 +513 @@
                 // 
                 MCalibrationChargePix &ugpix = (MCalibrationChargePix&)updatecam->GetAverageArea(0);
-                //  MBadPixelsPix         &ubad  = (MBadPixelsPix&)        updatecam->GetAverageBadArea(0);
-                //  if (ubad.IsUnsuitable())
-                //    *fLog << err << "Average Area is unsuitable!!!!" << endl;
 
                 const Float_t globmean = avpix.GetConvertedMean();
                 calibUpdate = (globmean == 0.) ? 1. : ugpix.GetConvertedMean() / globmean;
+
+                MBadPixelsPix         &ubad  = (MBadPixelsPix&)        updatecam->GetAverageBadArea(0);
+                if (ubad.IsUncalibrated(MBadPixelsPix::kChargeIsPedestal))
+                  {
+                    *fLog << warn << GetDescriptor() << "Probably calibration pulses have been lost!!!!" << endl;
+                    *fLog << warn << "Will not update calib. factors any more!!!!" << endl;
+                    calibUpdate = 1.;
+                  }
               }
-
+            
             switch(fCalibrationMode)
               {

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -350 +350 @@
 }
 
-Bool_t MJCalibTest::Process(MPedestalCam &pedcam)
-{
-    // const TString fname = GetOutputFile();
-  
-//  if (gSystem->AccessPathName(fname, kFileExists))
-    return ProcessFile(pedcam);
-  
-    // return kTRUE;
-}
-
 Bool_t MJCalibTest::ProcessFile(MPedestalCam &pedcam)
 {

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -541 +541 @@
 
 
-    MHCamEvent evt0(0, "PedFLG",      "Pedestal from Lo Gain;;P [fadc/sl]");
-    MHCamEvent evt1(2, "PedRmsFLG",   "Pedestal RMS from Lo Gain;;\\sigma_{p} [fadc/sl]");
-    MHCamEvent evt2(0, "Extra'd",     "Extracted Signal;;S [fadc/sl]");
+    MHCamEvent evt0(0, "PedFLG",      "Fundamental Pedestal from Lo Gain;;P [cnts/sl]");
+    MHCamEvent evt1(2, "PedRmsFLG",   "RMS from Extractor applied to ped.;;\\sigma_{p} [cnts/sl]");
+    MHCamEvent evt2(0, "Extra'd",     "Extracted Signal;;S [cnts/sl]");
     //    MHCamEvent evt3(4, "PedPhot",     "Calibrated Pedestal;;P [phe]");
-    MHCamEvent evt4(5, "PedRMS",      "Calibrated Pedestal RMS;;\\sigma_{p} [phe]");
+    MHCamEvent evt4(5, "PedRMS",      "Calibrated RMS from Extractor applied to ped.;;\\sigma_{p} [phe]");
     MHCamEvent evt5(3, "Interp'd",    "Interpolated Signal;;S [phe]");
     MHCamEvent evt6(2, "Unsuitable",  "Fraction of unsuitable events per Pixel;;[1]");
-    MHCamEvent evt7(0, "Times",       "Arrival Time;;T [slice]");
-    MHCamEvent evt8(0, "Conv",        "Calibration Conv. Factors;;[phe/fadc sl]");
+    MHCamEvent evt7(0, "Times",       "Arrival Time;;T [fadc sl]");
+    MHCamEvent evt8(0, "Conv",        "Calibration Conv. Factors;;[phe/fadc cnts]");
 
     evt0.EnableVariance();