Changeset 6074 for trunk

Timestamp:

01/28/05 10:46:47 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -45 +45 @@
      - new classes to allow display of changing cal. constants with the
        interlaced cal. events
+
+   * mcalib/MCalibrationChargeCalc.cc
+     - removed stopping of PostProcess in case that the evtloop is
+       finished with interlaced cal. events
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -789 +789 @@
 
       FinalizePedestals(ped,pix,aidx);
-      FinalizeCharges(pix, 
-                      fIntensCam ? fIntensCam->GetAverageBadArea(aidx) : fCam->GetAverageBadArea(aidx),
-                      "area id");
+      FinalizeCharges(pix, chargecam->GetAverageBadArea(aidx),"area id");
     }
   
@@ -821 +819 @@
       *fLog << warn << "Could not calculate the photons flux from the F-Factor method " << endl;
       chargecam->SetFFactorMethodValid(kFALSE); 
-      return kFALSE;
+      if (!fIntensCam)
+        return kFALSE;
     }