Changeset 7099 for trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

Timestamp:

05/27/05 16:33:19 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -181 +181 @@
 //  ClassVersion 2:
 //   - Float_t fPheErrLimit;
-//   + Float_t fPheErrLowerLimit;                   // Lower limit acceptance nr. phe's w.r.t. area idx mean (in sigmas)
-//   + Float_t fPheErrUpperLimit;                   // Upper limit acceptance nr. phe's w.r.t. area idx mean (in sigmas)
+//   + Float_t fPheErrLowerLimit; // Lower limit acceptance nr. phe's w.r.t. area idx mean (in sigmas)
+//   + Float_t fPheErrUpperLimit; // Upper limit acceptance nr. phe's w.r.t. area idx mean (in sigmas)
+//
+//  ClassVersion 3:
+//   + Bool_t  fUseExtractorRes;  // Include extractor resolution in F-Factor method
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -280 +283 @@
 //
 MCalibrationChargeCalc::MCalibrationChargeCalc(const char *name, const char *title)
-    : fGeom(NULL), fSignal(NULL), fCalibPattern(NULL)
+    : fUseExtractorRes(kFALSE),
+    fGeom(NULL), fSignal(NULL), fCalibPattern(NULL), fExtractor(NULL)
 {
         
@@ -661 +665 @@
       return kTRUE;
   }
-  
+
   if (fNumProcessed == 0)
     return kTRUE;
@@ -1017 +1021 @@
             << endl;
       bad.SetUncalibrated(MBadPixelsPix::kDeviatingNumPhes);
+      bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
+      return kFALSE;
+    }
+
+  if (cal.GetPheFFactorMethod() < 0.)
+    {
+      bad.SetUncalibrated(MBadPixelsPix::kDeviatingNumPhes);
+      bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
+      cal.SetFFactorMethodValid(kFALSE);
+      return kFALSE;
+    }
+
+  if (!cal.CalcConvFFactor())
+    {
+      *fLog << warn << "Could not calculate the Conv. FADC counts to Phes in ";
+      *fLog << what << ":           " << Form("%4i", cal.GetPixId()) << endl;
+      bad.SetUncalibrated(MBadPixelsPix::kDeviatingNumPhes);
+      return kFALSE;
+    }
+
+  if (!fUseExtractorRes)
+    return kTRUE;
+
+  if (!fExtractor)
+    {
+      *fLog << err << "Extractor resolution has been chosen, but not extractor is set. Cannot calibrate" << endl;
+      return kFALSE;
+    }
+
+  const Float_t resinphes = cal.IsHiGainSaturation()
+    ? cal.GetPheFFactorMethod()*fExtractor->GetResolutionPerPheLoGain()
+    : cal.GetPheFFactorMethod()*fExtractor->GetResolutionPerPheHiGain();
+
+  Float_t resinfadc = cal.IsHiGainSaturation()
+    ? resinphes/cal.GetMeanConvFADC2Phe()/cal.GetConversionHiLo()
+    : resinphes/cal.GetMeanConvFADC2Phe();
+
+  if (resinfadc > 1.5*cal.GetPedRms() )
+    {
+      *fLog << warn << " Extractor Resolution: " << resinfadc << " bigger than Pedestal RMS " << cal.GetPedRms() << endl;
+      resinfadc = cal.GetPedRms();
+    }
+
+  if (!cal.CalcReducedSigma(resinfadc))
+    {
+        *fLog << warn << "Could not calculate the reduced sigma in " << what;
+        *fLog << ":                        " << Form("%4i",cal.GetPixId()) << endl;
+        bad.SetUncalibrated( MBadPixelsPix::kChargeSigmaNotValid );
+        return kFALSE;
+    }
+
+  if (!cal.CalcFFactor())
+    {
+        *fLog << warn << "Could not calculate the F-Factor in " << what;
+        *fLog << ":                             " << Form("%4i",cal.GetPixId()) << endl;
+      bad.SetUncalibrated(MBadPixelsPix::kDeviatingNumPhes);
+      bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
       return kFALSE;
     }
@@ -2299 +2360 @@
       rc = kTRUE;
     }
+  if (IsEnvDefined(env, prefix, "UseExtractorRes", print))
+    {
+      SetUseExtractorRes(GetEnvValue(env, prefix, "UseExtractorRes", fUseExtractorRes));
+      rc = kTRUE;
+    }
 
   return rc;