Changeset 5946 for trunk/MagicSoft/Mars/mcalib

Timestamp:

01/23/05 13:49:09 (20 years ago)

Author:

mazin

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationHiLoCam.cc (modified) (4 diffs)
• MCalibrationHiLoPix.h (modified) (1 diff)
• MCalibrationIntensityHiLoCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoCam.cc

@@ -139 +139 @@
           *fLog << all 
                 << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Pix  ",pix->GetPixId(),
-                        ":            Ratio: ",pix->GetHiLoRatio()," +- ",pix->GetHiLoRatioErr(),
-                        "   Sigma: ",pix->GetHiLoSigma()," +- ",pix->GetHiLoSigmaErr())
+                        ":            Ratio: ",pix->GetHiLoChargeRatio()," +- ",pix->GetHiLoChargeRatioErr(),
+                        "   Sigma: ",pix->GetHiLoChargeRatioSigma()," +- ",pix->GetHiLoChargeRatioSigmaErr())
                 << endl;
           id++;
@@ -173 +173 @@
     *fLog << all 
           << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Area   ",pix->GetPixId(),
-                  ":  Ratio: ",pix->GetHiLoRatio()," +- ",pix->GetHiLoRatioErr(),
-                  "   Sigma: ",pix->GetHiLoSigma()," +- ",pix->GetHiLoSigmaErr())
+                  ":  Ratio: ",pix->GetHiLoChargeRatio()," +- ",pix->GetHiLoChargeRatioErr(),
+                  "   Sigma: ",pix->GetHiLoChargeRatioSigma()," +- ",pix->GetHiLoChargeRatioSigmaErr())
           << endl;
   }
@@ -183 +183 @@
     *fLog << all 
           << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Sector ",pix->GetPixId(),
-                  ":  Ratio: ",pix->GetHiLoRatio()," +- ",pix->GetHiLoRatioErr(),
-                  "   Sigma: ",pix->GetHiLoSigma()," +- ",pix->GetHiLoSigmaErr())
+                  ":  Ratio: ",pix->GetHiLoChargeRatio()," +- ",pix->GetHiLoChargeRatioErr(),
+                  "   Sigma: ",pix->GetHiLoChargeRatioSigma()," +- ",pix->GetHiLoChargeRatioSigmaErr())
           << endl;
   }
@@ -225 +225 @@
       if (pix.IsExcluded())
         return kFALSE;
-      val = pix.GetMean();
+      val = pix.GetHiLoChargeRatio();
       break;
     case 1:
       if (pix.IsExcluded())
         return kFALSE;
-      val = pix.GetMeanErr();
+      val = pix.GetHiLoChargeRatioErr();
       break;
     case 2:
       if (pix.IsExcluded())
         return kFALSE;
-      val = pix.GetSigma();
+      val = pix.GetHiLoChargeRatioSigma();
       break;
     case 3:
       if (pix.IsExcluded())
         return kFALSE;
-      val = pix.GetSigmaErr();
+      val = pix.GetHiLoChargeRatioSigmaErr();
       break;
     case 4:
       if (pix.IsExcluded())
         return kFALSE;
-      val = pix.GetProb();
+      val = pix.GetHiLoChargeRatioProb();
+      break;
+    case 5:
+      if (pix.IsExcluded())
+        return kFALSE;
+      val = pix.GetHiLoTimeDiff();
+      break;
+    case 6:
+      if (pix.IsExcluded())
+        return kFALSE;
+      val = pix.GetHiLoTimeDiffErr();
+      break;
+    case 7:
+      if (pix.IsExcluded())
+        return kFALSE;
+      val = pix.GetHiLoTimeDiffSigma();
+      break;
+    case 8:
+      if (pix.IsExcluded())
+        return kFALSE;
+      val = pix.GetHiLoTimeDiffSigmaErr();
+      break;
+    case 9:
+      if (pix.IsExcluded())
+        return kFALSE;
+      val = pix.GetHiLoTimeDiffProb();
       break;
     default:

trunk/MagicSoft/Mars/mcalib/MCalibrationHiLoPix.h

@@ -15 +15 @@
   ~MCalibrationHiLoPix() {}
   
-  Float_t GetHiLoRatio()    const { return GetMean();        }
-  Float_t GetHiLoRatioErr() const { return GetMeanErr();     }
-  Float_t GetHiLoSigma()    const { return GetSigma();       }
-  Float_t GetHiLoSigmaErr() const { return GetSigmaErr();    }
+  Float_t GetHiLoChargeRatio()         const { return GetHiGainMean();     }
+  Float_t GetHiLoChargeRatioErr()      const { return GetHiGainMeanErr();  }
+  Float_t GetHiLoChargeRatioSigma()    const { return GetHiGainSigma();    }
+  Float_t GetHiLoChargeRatioSigmaErr() const { return GetHiGainSigmaErr(); }
+  Float_t GetHiLoChargeRatioProb()     const { return GetHiGainProb();     }
+                                                                           
+  Float_t GetHiLoTimeDiff()            const { return GetLoGainMean();     }
+  Float_t GetHiLoTimeDiffErr()         const { return GetLoGainMeanErr();  }
+  Float_t GetHiLoTimeDiffSigma()       const { return GetLoGainSigma();    }
+  Float_t GetHiLoTimeDiffSigmaErr()    const { return GetLoGainSigmaErr(); }
+  Float_t GetHiLoTimeDiffProb()        const { return GetLoGainProb();     }
 
   ClassDef(MCalibrationHiLoPix, 1)      // Container HiLo conversion Calibration Results Pixel

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityHiLoCam.cc

@@ -139 +139 @@
         continue;
       //
-      ratio[cnt]    = relpix.GetHiLoRatio();
-      ratioerr[cnt] = relpix.GetHiLoRatioErr();
+      ratio[cnt]    = relpix.GetHiLoChargeRatio();
+      ratioerr[cnt] = relpix.GetHiLoChargeRatioErr();
       //
       sig   [cnt] = pix.GetPheFFactorMethod();
@@ -219 +219 @@
             continue;
           
-          ratiool  += relpix.GetHiLoRatio();
-          ratiool2 += relpix.GetHiLoRatio()*relpix.GetHiLoRatio();
+          ratiool  += relpix.GetHiLoChargeRatio();
+          ratiool2 += relpix.GetHiLoChargeRatio()*relpix.GetHiLoChargeRatio();
           num++;
         }