Changeset 9153 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

11/11/08 11:49:49 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationCam.cc (modified) (8 diffs)
• MHCalibrationCam.h (modified) (1 diff)
• MHCalibrationChargePINDiode.cc (modified) (2 diffs)
• MHCalibrationChargePINDiode.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -868 +868 @@
 // Call FillHists()
 //
-Bool_t MHCalibrationCam::Fill(const MParContainer *par, const Stat_t w)
+Int_t MHCalibrationCam::Fill(const MParContainer *par, const Stat_t w)
 {
   if (fCurrentNumEvts >= fMaxNumEvts)
@@ -878 +878 @@
 
   if (!IsSizeCheck())
-    return FillHists(par,w);
+  {
+      const Bool_t rc = FillHists(par,w);
+      return rc ? kTRUE : kERROR;
+  }
 
   const Int_t npixels  = fGeom->GetNumPixels();
@@ -890 +893 @@
     {
       *fLog << err << "ERROR - Size mismatch in number of pixels... abort." << endl;
-      return kFALSE;
+      return kERROR;
     }
   
@@ -898 +901 @@
         {
           *fLog << err << "ERROR - Size mismatch in number of pixels... abort." << endl;
-          return kFALSE;
+          return kERROR;
         }
     }
@@ -908 +911 @@
     {
       *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl;
-      return kFALSE;
+      return kERROR;
     }
   
@@ -914 +917 @@
     {
       *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl;
-      return kFALSE;
+      return kERROR;
     }
   
@@ -923 +926 @@
         {
           *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl;
-          return kFALSE;
+          return kERROR;
         }
       
@@ -929 +932 @@
         {
           *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl;
-          return kFALSE;
+          return kERROR;
         }
     }
-  
-  return FillHists(par, w);
+
+  const Bool_t rc = FillHists(par, w);
+
+  return rc ? kTRUE : kERROR;
 }
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h

@@ -180 +180 @@
   Bool_t SetupFill(const MParList *pList);
   Bool_t ReInit   (      MParList *pList);
-  Bool_t Fill     (const MParContainer *par, const Stat_t w=1);
+  Int_t  Fill     (const MParContainer *par, const Stat_t w=1);
   Bool_t Finalize ( );
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc

@@ -225 +225 @@
 // - FillRmsCharge(rms);
 //
-Bool_t MHCalibrationChargePINDiode::Fill(const MParContainer *par, const Stat_t w)
+Int_t MHCalibrationChargePINDiode::Fill(const MParContainer *par, const Stat_t w)
 {
 
@@ -232 +232 @@
     {
       *fLog << err << "No argument in MExtractedSignalPINDiode::Fill... abort." << endl;
-      return kFALSE;
+      return kERROR;
     }
   

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.h

@@ -72 +72 @@
   Bool_t SetupFill(const MParList *pList);
   Bool_t ReInit   (      MParList *pList);
-  Bool_t Fill     (const MParContainer *par, const Stat_t w=1);
+  Int_t  Fill     (const MParContainer *par, const Stat_t w=1);
   Bool_t Finalize ();