Changeset 2983 for trunk/MagicSoft/Mars/manalysis

Timestamp:

01/30/04 14:27:46 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

@@ -193 +193 @@
     return kFALSE;
 
-  const Float_t pederr   = (*this)[idx].GetPedestalRms()/TMath::Sqrt((Float_t)fNumTotSlices);
-  const Float_t rmserr   = (*this)[idx].GetPedestalRms()/TMath::Sqrt((Float_t)fNumTotSlices/2.);
+  const Float_t ped      = (*this)[idx].GetPedestal();
+  const Float_t rms      = (*this)[idx].GetPedestalRms();
+
+  const Float_t pederr   = rms/TMath::Sqrt((Float_t)fNumTotSlices);
+  const Float_t rmserr   = rms/TMath::Sqrt((Float_t)fNumTotSlices/2.);
 
   const Float_t mean     = (*this)[idx].GetMean()     / (Float_t)fNumExtractSlices;
@@ -204 +207 @@
     {
     case 0:
-      val = (*this)[idx].GetPedestal();
+      val = ped;
       break;
     case 1:
@@ -210 +213 @@
       break;
     case 2:
-      val = (*this)[idx].GetPedestalRms();
+      val = rms;
       break;
     case 3:
@@ -247 +250 @@
     case 9:
       //      if ((*this)[idx].IsFitValid())
-      val = ((*this)[idx].GetPedestal()-mean);
+      val = 2.*(ped-mean)/(ped+mean);
         //      else
         //        return kFALSE;
       break;
     case 10:
-      val = TMath::Sqrt(pederr*pederr + meanerr*meanerr);
+      val = TMath::Sqrt((pederr*pederr + meanerr*meanerr) * (ped*ped + mean*mean))
+            *2./(ped+mean)/(ped+mean);
       break;
     case 11:
-      val = (*this)[idx].GetPedestalRms()-sigma;
+      val = 2.*(pederr - meanerr)/(pederr + meanerr);
       break;
     case 12:
-      val = TMath::Sqrt(rmserr*rmserr + sigmaerr*sigmaerr);
+      val = 2.*(rms-sigma)/(rms+sigma);
+      break;
+    case 13:
+      val = TMath::Sqrt((rmserr*rmserr + sigmaerr*sigmaerr) * (rms*rms + sigma*sigma))
+            *2./(rms+sigma)/(rms+sigma);
+      break;
+    case 14:
+      //      if ((*this)[idx].IsFitValid())
+      val = 2.*(rmserr - sigmaerr)/(rmserr + sigmaerr);
+              //      else
+        //        return kFALSE;
       break;
     default: