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

Timestamp:

02/02/04 22:52:53 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -59 +59 @@
 
 using namespace std;
+
+const Int_t   MCalibrationCam::gkBlindPixelId   =  559;
+const Int_t   MCalibrationCam::gkPINDiodeId     = 9999;
+const Float_t MCalibrationCam::gkTimeSliceWidth = 3.3;
+
 // --------------------------------------------------------------------------
 //
@@ -72 +77 @@
     : fOffsets(NULL),
       fSlopes(NULL),
-      fOffvsSlope(NULL),
-      fBlindPixelId(559),
-      fPINDiodeId(9999)
+      fOffvsSlope(NULL)
 {
     fName  = name  ? name  : "MCalibrationCam";
@@ -261 +264 @@
     {
       
-      if (pix->IsFitValid() && !pix->IsExcluded()) 
+      if (pix->IsChargeFitValid() && !pix->IsExcluded()) 
         {
 
@@ -287 +290 @@
       {
         
-        if (!pix->IsFitValid() && !pix->IsExcluded())
+        if (!pix->IsChargeFitValid() && !pix->IsExcluded())
           {
 
@@ -388 +391 @@
     return kFALSE;
 
-  if ( (!(*this)[idx].IsFitValid()) || (*this)[idx].IsExcluded())
-    return kFALSE;
-  
-  if (idx == fBlindPixelId)
-    return kFALSE;
-
-  if (idx == fPINDiodeId)
+  if ( (!(*this)[idx].IsChargeFitValid()) || (*this)[idx].IsExcluded())
+    return kFALSE;
+  
+  if (idx == gkBlindPixelId)
+    return kFALSE;
+
+  if (idx == gkPINDiodeId)
     return kFALSE;
 
@@ -415 +418 @@
       break;
     case 5:
-      val = (*this)[idx].GetTime();
+      if (!(*this)[idx].IsTimeFitValid())
+        return kFALSE;
+      val = (*this)[idx].GetTime() * gkTimeSliceWidth;
       break;
     case 6:
-      val = (*this)[idx].GetSigmaTime();
+      if (!(*this)[idx].IsTimeFitValid())
+        return kFALSE;
+      val = (*this)[idx].GetSigmaTime() * gkTimeSliceWidth;
       break;
     case 7:
-      val = (*this)[idx].GetTimeChiSquare();
+      if (!(*this)[idx].IsTimeFitValid())
+        return kFALSE;
+      val = (*this)[idx].GetTimeProb();
       break;
     case 8:
@@ -550 +559 @@
 {
 
-  if (!fPINDiode->IsFitValid())
+  if (!fPINDiode->IsChargeFitValid())
     return kFALSE;