Changeset 4618 for trunk

Timestamp:

08/16/04 11:05:05 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationCam.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2004/08/16: Markus Gaug
+ 
+   * mcalib/MHCalibrationCam.cc
+     - add a criterion to stop the Finalize() if both fHiGainArray 
+       and fLoGainArray have not been expanded. 
+     - replace two gLog by *fLog
 
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc

@@ -448 +448 @@
       if (!fBadPixels)
         {
-          gLog << err << "Cannot find nor create MBadPixelsCam ... abort." << endl;
+          *fLog << err << "Cannot find nor create MBadPixelsCam ... abort." << endl;
           return kFALSE;
         }
@@ -561 +561 @@
   if (fHiGainArray->GetEntries() != npixels)
     {
-      gLog << err << "ERROR - Size mismatch... abort." << endl;
+      *fLog << err << "ERROR - Size mismatch... abort." << endl;
       return kFALSE;
     }
@@ -567 +567 @@
   if (fLoGainArray->GetEntries() != npixels)
     {
-      gLog << err << "ERROR - Size mismatch... abort." << endl;
+      *fLog << err << "ERROR - Size mismatch... abort." << endl;
       return kFALSE;
     }
@@ -606 +606 @@
 // --------------------------------------------------------------------------
 //
+// 0) Ask if fHiGainArray and fLoGainArray have been initialized, 
+//    otherwise return kFALSE.
 // 1) FinalizeHists()
 // 2) FinalizeBadPixels()
@@ -612 +614 @@
 Bool_t MHCalibrationCam::Finalize()
 {
+
+  if (fHiGainArray->GetEntries() == 0 && fLoGainArray->GetEntries() == 0)
+    {
+      *fLog << err << GetDescriptor() 
+            << ": ERROR: Both (HiGain and LoGain) histogram arrays have not been initialized... abort." << endl;
+      return kFALSE;
+    }
+  
   if (!FinalizeHists())
     return kFALSE;