Changeset 3115 for trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc

Timestamp:

02/12/04 12:42:48 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc

@@ -113 +113 @@
   CLRBIT(fFlags, kFFactorMethodValid);
   CLRBIT(fFlags, kPINDiodeMethodValid);
+  CLRBIT(fFlags, kCombinedMethodValid);
 
   fCharge                           =  -1.;
@@ -143 +144 @@
   fMeanConversionBlindPixelMethod   =  -1.;
   fMeanConversionPINDiodeMethod     =  -1.;
+  fMeanConversionCombinedMethod     =  -1.;
 
   fErrorConversionFFactorMethod     =  -1.;
   fErrorConversionBlindPixelMethod  =  -1.;
   fErrorConversionPINDiodeMethod    =  -1.;
+  fErrorConversionCombinedMethod    =  -1.;
 
   fSigmaConversionFFactorMethod     =  -1.;
   fSigmaConversionBlindPixelMethod  =  -1.;
   fSigmaConversionPINDiodeMethod    =  -1.;
+  fSigmaConversionCombinedMethod    =  -1.;
 
   fFactorCalculated = kFALSE;
@@ -191 +195 @@
   fErrorConversionFFactorMethod = err;
   fSigmaConversionFFactorMethod = sig;
+}
+
+// --------------------------------------------------------------------------
+//
+// Set the conversion factors from outside (only for MC)
+//
+void MCalibrationPix::SetConversionCombinedMethod(Float_t c, Float_t err, Float_t sig)
+{
+  fMeanConversionCombinedMethod = c;
+  fErrorConversionCombinedMethod = err;
+  fSigmaConversionCombinedMethod = sig;
 }
 
@@ -395 +410 @@
 }
 
-
+Float_t MCalibrationPix::GetTotalFFactorCombinedMethod() 
+{
+  return 1.;
+}
+
+Float_t MCalibrationPix::GetTotalFFactorErrorCombinedMethod() 
+{
+
+  return 1.;
+}
 
 Float_t MCalibrationPix::GetMeanConversionFFactorMethod()
@@ -485 +509 @@
 { 
   return TESTBIT(fFlags, kPINDiodeMethodValid);    
+}
+
+Bool_t MCalibrationPix::IsCombinedMethodValid() 
+{ 
+  return TESTBIT(fFlags, kCombinedMethodValid);    
 }