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

Timestamp:

02/05/04 17:28:52 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -267 +267 @@
         {
 
-          Float_t rsigma = pix->GetRSigmaSquare();
-          if (rsigma > 0.)
-            rsigma = TMath::Sqrt(rsigma);
-
           *fLog << all << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " 
                 << pix->GetPedRms() << " Reduced Charge: " << pix->GetCharge() << " +- " 
-                << pix->GetSigmaCharge() << " Reduced Sigma: " << rsigma 
+                << pix->GetSigmaCharge() << " Reduced Sigma: " << pix->GetRSigmaCharge() 
                 << " Nr Phe's: " << pix->GetPheFFactorMethod() << endl;
-          id++;
+          id++;
         }
     }
@@ -293 +289 @@
           {
 
-            Float_t rsigma = pix->GetRSigmaSquare();
-            if (rsigma > 0.)
-              rsigma = TMath::Sqrt(rsigma);
-            
             *fLog << all << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " 
                   << pix->GetPedRms() << " Reduced Charge: " << pix->GetCharge() << " +- " 
-                  << pix->GetSigmaCharge() << " Reduced Sigma: " << rsigma << endl;
+                  << pix->GetSigmaCharge() << " Reduced Sigma: " << pix->GetRSigmaCharge() << endl;
             id++;
           }
@@ -420 +412 @@
       if (!(*this)[idx].IsTimeFitValid())
         return kFALSE;
-      val = (*this)[idx].GetTime() * gkTimeSliceWidth;
+      val = (*this)[idx].GetMeanTimeOffset() * gkTimeSliceWidth;
       break;
     case 6:
       if (!(*this)[idx].IsTimeFitValid())
         return kFALSE;
-      val = (*this)[idx].GetSigmaTime() * gkTimeSliceWidth;
+      val = (*this)[idx].GetTimingPrecision() * gkTimeSliceWidth;
       break;
     case 7:
@@ -439 +431 @@
       break;
     case 10:
-      if ((*this)[idx].GetRSigmaSquare() > 0.)
-        val = TMath::Sqrt((*this)[idx].GetRSigmaSquare());
-      else
-        val = -1.;
+      val = (*this)[idx].GetRSigmaCharge();
       break;
     case 11:
@@ -469 +458 @@
       break;
     case 17:
-      if ( (*this)[idx].GetRSigmaSquare() > 0. && (*this)[idx].GetCharge() > 0. )
-        val = TMath::Sqrt((*this)[idx].GetRSigmaSquare()) / (*this)[idx].GetCharge();
-      else
-        val = -1.;
+      val = (*this)[idx].GetRSigmaCharge() / (*this)[idx].GetCharge();
       break;
     case 18: