Changeset 6528 for trunk/MagicSoft

Timestamp:

02/16/05 15:48:20 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhcalib/MHCalibrationCam.cc (modified) (2 diffs)
• mhcalib/MHCalibrationChargePINDiode.cc (modified) (1 diff)
• mhcalib/MHCalibrationHiLoCam.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -54 +54 @@
    * mhist/MHCamEvent.cc:
      - replaced the warn in SetupFill by an inf
+
+   * mhcalib/MHCalibrationCam.cc, mhcalib/MHCalibrationHiLoCam.cc,
+     mhcalib/MHCalibrationChargePINDiode.cc:
+     - removed obsolete output after a failed FindCreateObj (the
+       function itself does the output in case of failure)
+
+   * mhcalib/MHCalibrationCam.cc:
+     - replaced 'err' by 'warn' for under-/overflow in lo-gain pixel,
+       it doesn't result in an fatal error (abort)
 
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -1198 +1198 @@
     {
       *fLog << warn << GetDescriptor()
-            << ": Only overflow or underflow in high-gain pixel: " << pix.GetPixId() << endl;
+            << ": Only overflow or underflow in hi-gain pixel: " << pix.GetPixId() << endl;
       return;
     }  
@@ -1281 +1281 @@
   if (hist.IsEmpty() || hist.IsOnlyOverflow() || hist.IsOnlyUnderflow())
     {
-      *fLog << err << GetDescriptor()
-            << ": Only overflow or underflow in low-gain pixel: " << pix.GetPixId() << endl;
+      *fLog << warn << GetDescriptor()
+            << ": Only overflow or underflow in lo-gain pixel: " << pix.GetPixId() << endl;
       return;
     }  

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc

@@ -206 +206 @@
   fSigPIN = (MExtractedSignalPINDiode*)pList->FindCreateObj("MExtractedSignalPINDiode");
   if (!fSigPIN)
-  {
-      *fLog << err << "MExtractedSignalPINDiode not found... aborting " << endl;
       return kFALSE;
-  }
 
   fPINDiode = (MCalibrationChargePINDiode*)pList->FindCreateObj("MCalibrationChargePINDiode");
   if (!fPINDiode)
-  {
-      *fLog << err << "MCalibrationChargePINDiode not found... aborting " << endl;
       return kFALSE;
-  }
 
   return kTRUE;

trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc

@@ -239 +239 @@
       fCam = (MCalibrationCam*)pList->FindCreateObj(AddSerialNumber("MCalibrationHiLoCam"));
       if (!fCam)
-        {
-          *fLog << err << "Cannot find nor create MCalibrationHiLoCam... abort." << endl;
           return kFALSE;
-        }
       fCam->Init(*fGeom);
     }