Changeset 2956 for trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

Timestamp:

01/29/04 15:56:15 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -72 +72 @@
     : fOffsets(NULL),
       fSlopes(NULL),
-      fOffvsSlope(NULL)
+      fOffvsSlope(NULL),
+      fBlindPixelId(559),
+      fPINDiodeId(9999)
 {
     fName  = name  ? name  : "MCalibrationCam";
@@ -181 +183 @@
   fPINDiode->Clear();
 
-  fNumPhotInsidePlexiglassAvailable  = kFALSE;
   fMeanPhotInsidePlexiglass          = -1.;
   fMeanPhotErrInsidePlexiglass       = -1.;
-  fNumPhotOutsidePlexiglassAvailable = kFALSE;
   fMeanPhotOutsidePlexiglass         = -1.;
   fMeanPhotErrOutsidePlexiglass      = -1.;
 
   fNumExcludedPixels                 = 0;
+
+  CLRBIT(fFlags,kBlindPixelMethodValid);
+  CLRBIT(fFlags,kPINDiodeMethodValid);
+  CLRBIT(fFlags,kNumPhotInsidePlexiglassAvailable);
+  CLRBIT(fFlags,kNumPhotOutsidePlexiglassAvailable);  
 
   return;
@@ -223 +228 @@
   return TESTBIT(fFlags,kPINDiodeMethodValid);  
 }
+
+
+Bool_t  MCalibrationCam::IsNumPhotInsidePlexiglassAvailable()   const
+{
+  return TESTBIT(fFlags,kNumPhotInsidePlexiglassAvailable);
+}
+
+Bool_t  MCalibrationCam::IsNumPhotOutsidePlexiglassAvailable()   const
+{
+  return TESTBIT(fFlags,kNumPhotOutsidePlexiglassAvailable);
+}
+
 
 
@@ -374 +391 @@
     return kFALSE;
   
-  if (idx == gkCalibrationBlindPixelId)
+  if (idx == fBlindPixelId)
+    return kFALSE;
+
+  if (idx == fPINDiodeId)
     return kFALSE;
 
@@ -501 +521 @@
     }
 
-  fNumPhotInsidePlexiglassAvailable = kTRUE;
+  SETBIT(fFlags,kNumPhotInsidePlexiglassAvailable);
 
   *fLog << inf << endl;
@@ -557 +577 @@
     }
 
-  fNumPhotOutsidePlexiglassAvailable = kTRUE;
+  SETBIT(fFlags,kNumPhotOutsidePlexiglassAvailable);  
 
   *fLog << inf << endl;
@@ -583 +603 @@
     return kFALSE;
 
-  if (!fNumPhotInsidePlexiglassAvailable)
+  if (!IsNumPhotInsidePlexiglassAvailable())
     if (!CalcNumPhotInsidePlexiglass())
       return kFALSE;
@@ -627 +647 @@
   if (ipx < 0 || !IsPixelFitted(ipx))
     return kFALSE;
+
+  if (!IsNumPhotOutsidePlexiglassAvailable())
+    if (!CalcNumPhotOutsidePlexiglass())
+      return kFALSE;
+
+  mean  = (*this)[ipx].GetMeanConversionPINDiodeMethod();
+  err   = (*this)[ipx].GetErrorConversionPINDiodeMethod();
+  sigma = (*this)[ipx].GetSigmaConversionPINDiodeMethod();
 
   return kFALSE;