Changeset 6828 for trunk/MagicSoft/Mars/mcalib

Timestamp:

03/16/05 13:27:32 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibColorSet.cc (modified) (1 diff)
• MCalibrationChargeCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc

@@ -316 +316 @@
       return kFALSE;
       break;
-      
+
+    case 40493:
     case 45116:
     case 45609:
     case 45219:
-      *fLog << err << "Sorry, run " << num << " was taken with a combination of colours used to flat-field ";
+      *fLog << err << dec << "Sorry, run " << num 
+            << " was taken with a combination of colours used to flat-field ";
       *fLog << err << "the camera. It cannot be used for the standard calibration " << endl;
       return kFALSE;

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -588 +588 @@
           *fLog << warn << "Multiple colours used simultaneously!" ;
           fHCam->Finalize();
-          fHBlindCam->Finalize();
+          if (fHBlindCam)
+            fHBlindCam->Finalize();
 
           Finalize();
 
           fHCam->ResetHists();
-          fHBlindCam->ResetHists();
+          if (fHBlindCam)
+            fHBlindCam->ResetHists();
 
           *fLog << inf << "Starting next calibration... " << flush;
 
           fHCam->SetColor(col);
-          fHBlindCam->SetColor(col);
+          if (fHBlindCam)
+            fHBlindCam->SetColor(col);
 
           fCam->SetPulserColor(col);
@@ -623 +626 @@
   
   fHCam->SetColor(col);
-  fHBlindCam->SetColor(col);
+  if (fHBlindCam)
+    fHBlindCam->SetColor(col);
 
   MCalibrationBlindCam  *blindcam  = fIntensBlind