Changeset 5405 for trunk/MagicSoft

Timestamp:

11/16/04 10:05:51 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (3 diffs)
• MCalibrationQEPix.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -600 +600 @@
        pattern & kCT1Pulser) && fPulserColor != MCalibrationCam::kNONE)
   {
-      *fLog << err << "Multiple colours used simultaneously in calibration file. Will skip this part!" << endl;
-      return kFALSE;
+      *fLog << err << "Multiple colours used simultaneously in calibration file. Will reset histograms " 
+            << " and merge the MCalibrationQECam!" << endl;
+      fHCam->Finalize();
+      fHBlindCam->Finalize();
+      fHCam->ResetHists();
+      fHBlindCam->ResetHists();
+      CallPostProcess();
   }
 
@@ -1670 +1675 @@
       qepix.SetFFactorMethodValid(  kTRUE   , fPulserColor );
 
-      if (!qepix.UpdateFFactorMethod())
+      if (!qepix.UpdateFFactorMethod( qecam->GetPlexiglassQE(), qecam->GetPlexiglassQERelVar() ))
         *fLog << warn << GetDescriptor() 
               << ": Cannot update Quantum efficiencies with the F-Factor Method" << endl;
@@ -1898 +1903 @@
       qepix.SetBlindPixelMethodValid(  kTRUE   , fPulserColor );
 
-      if (!qepix.UpdateBlindPixelMethod())
+      if (!qepix.UpdateBlindPixelMethod( qecam->GetPlexiglassQE(), qecam->GetPlexiglassQERelVar() ))
         *fLog << warn << GetDescriptor() 
               << ": Cannot update Quantum efficiencies with the Blind Pixel Method" << endl;

trunk/MagicSoft/Mars/mcalib/MCalibrationQEPix.cc

@@ -198 +198 @@
 const Float_t MCalibrationQEPix::gkDefaultQEUVErr      = 0.012;
 const Float_t MCalibrationQEPix::gkDefaultQECT1Err     = 0.012;
-const Float_t MCalibrationQEPix::gkDefaultAverageQE    = 0.18 ;     
+const Float_t MCalibrationQEPix::gkDefaultAverageQE    = 0.184;     
 const Float_t MCalibrationQEPix::gkDefaultAverageQEErr = 0.02 ;  
 const Float_t MCalibrationQEPix::gkPMTCollectionEff    = 0.90 ;