Changeset 4612 for trunk/MagicSoft

Timestamp:

08/13/04 15:13:23 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibration.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1230 +1230 @@
 Bool_t MJCalibration::ReadCalibrationCam()
 {
-
   const TString fname = GetOutputFile();
   
   if (gSystem->AccessPathName(fname, kFileExists))
-    {
+  {
       *fLog << err << "Input file " << fname << " doesn't exist." << endl;
       return kFALSE;
-    }
-  
+  }
+
   *fLog << inf << "Reading from file: " << fname << endl;
 
   TFile file(fname, "READ");
   if (fCalibrationCam.Read()<=0)
-    {
+  {
       *fLog << err << "Unable to read MCalibrationChargeCam from " << fname << endl;
       return kFALSE;
-    }
-  
+  }
+
   if (fQECam.Read()<=0)
-    {
+  {
       *fLog << err << "Unable to read MCalibrationQECam from " << fname << endl;
       return kFALSE;
-    }
-  
-
-  if (fRelTimes)
-    if (fRelTimeCam.Read()<=0)
+  }
+
+
+  if (file.FindKey("MCalibrationRelTimeCam"))
+      if (fRelTimeCam.Read()<=0)
       {
-        *fLog << err << "Unable to read MCalibrationRelTimeCam from " << fname << endl;
-        return kFALSE;
+          *fLog << err << "Unable to read MCalibrationRelTimeCam from " << fname << endl;
+          return kFALSE;
       }
-  
+
   if (file.FindKey("MBadPixelsCam"))
-    {
+  {
       MBadPixelsCam bad;
       if (bad.Read()<=0)
-        {
+      {
           *fLog << err << "Unable to read MBadPixelsCam from " << fname << endl;
           return kFALSE;
-        }
+      }
       fBadPixels.Merge(bad);
-    }
-  
+  }
+
   if (fDisplay /*&& !fDisplay->GetCanvas("Pedestals")*/) // FIXME!
-    fDisplay->Read();
-  
+      fDisplay->Read();
+
   return kTRUE;
 }