Changeset 3445 for trunk/MagicSoft/Mars/mcalib

Timestamp:

03/09/04 14:36:31 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (1 diff)
• MHCalibrationChargeBlindPix.cc (modified) (3 diffs)
• MHCalibrationChargeCam.cc (modified) (5 diffs)
• MHCalibrationChargePINDiode.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -348 +348 @@
 
       if (bad.IsBad())
-        {
+      {
           pix.SetExcluded();
           continue;
-        }
-      
+      }
+
       pix.SetAbsTimeBordersHiGain(fSignals->GetFirstUsedSliceHiGain(),
                                   fSignals->GetLastUsedSliceHiGain());

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc

@@ -241 +241 @@
     if (!fRawEvt)
     {
-      *fLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
+      *fLog << err << "MRawEvtData not found... aborting." << endl;
       return kFALSE;
     }
@@ -248 +248 @@
   if (!fSignal)
   {
-      *fLog << err << GetDescriptor() << ": ERROR: Could not find MExtractedSignalBlindPixel ... aborting " << endl;
+      *fLog << err << "MExtractedSignalBlindPixel not found... aborting " << endl;
       return kFALSE;
   }
@@ -262 +262 @@
   fBlindPix = (MCalibrationChargeBlindPix*)pList->FindCreateObj("MCalibrationChargeBlindPix");
   if (!fBlindPix)
-  {
-      *fLog << err << GetDescriptor() << ": ERROR: Could not find MCalibrationChargeBlindPix ... aborting " << endl;
-      return kFALSE;
-  }
+      return kFALSE;
 
   return kTRUE;

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -275 +275 @@
   
   fRawEvt = (MRawEvtData*)pList->FindObject("MRawEvtData");
-
   if (!fRawEvt)
   {
-      gLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
+      *fLog << err << dbginf << "MRawEvtData not found... aborting." << endl;
       return kFALSE;
   }
 
   fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
-
   if (!fGeom)
   {
-      gLog << err << dbginf << "MGeomCam not found... aborting." << endl;
+      *fLog << err << "MGeomCam not found... aborting." << endl;
       return kFALSE;
   }
@@ -306 +304 @@
   fBadPixels = (MBadPixelsCam*)pList->FindCreateObj("MBadPixelsCam");
   if (!fBadPixels)
+      return kFALSE;
+
+
+  fCam = (MCalibrationChargeCam*)pList->FindCreateObj("MCalibrationChargeCam");
+  if (!fCam)
+      return kFALSE;
+
+  MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
+  if (!signal)
   {
-      gLog << err << GetDescriptor() << ": ERROR: Could not find MBadPixelsCam ... aborting " << endl;
+      *fLog << err << "MExtractedSignalCam not found... abort." << endl;
       return kFALSE;
   }
-
-
-  fCam = (MCalibrationChargeCam*)pList->FindCreateObj("MCalibrationChargeCam");
-  if (!fCam)
-  {
-      gLog << err << GetDescriptor() << ": ERROR: Could not find MCalibrationChargeCam ... aborting " << endl;
-      return kFALSE;
-  }
-
-  MExtractedSignalCam *signal = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
-  if (!signal)
-    {
-      gLog << err << "No argument in MExtractedSignalCam::ReInit... abort." << endl;
-      return kFALSE;
-    }
 
   const Int_t n = signal->GetSize();
@@ -382 +374 @@
   if (!signal)
     {
-      gLog << err << "No argument in MExtractedSignalCam::Fill... abort." << endl;
+      *fLog << err << "No argument in MExtractedSignalCam::Fill... abort." << endl;
       return kFALSE;
     }
@@ -390 +382 @@
   if (fHiGainArray->GetEntries() != n)
     {
-      gLog << err << "ERROR - Size mismatch... abort." << endl;
+      *fLog << err << "ERROR - Size mismatch... abort." << endl;
       return kFALSE;
     }
@@ -396 +388 @@
   if (fLoGainArray->GetEntries() != n)
     {
-      gLog << err << "ERROR - Size mismatch... abort." << endl;
+      *fLog << err << "ERROR - Size mismatch... abort." << endl;
       return kFALSE;
     }

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc

@@ -134 +134 @@
   if (!fPINDiode)
   {
-      *fLog << err << GetDescriptor() << ": ERROR: Could not find MCalibrationChargePINDiode ... aborting " << endl;
+      *fLog << err << "MCalibrationChargePINDiode not found... aborting " << endl;
       return kFALSE;
   }
@@ -163 +163 @@
   if (fExtractSlices != 0. && slices != fExtractSlices )
     {
-      gLog << err << "Number of used signal slices changed in MExtractedSignalCam  ... abort." 
+      *fLog << err << "Number of used signal slices changed in MExtractedSignalCam  ... abort."
            << endl;
       return kFALSE;