Changeset 3555 for trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

Timestamp:

03/19/04 19:37:51 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -177 +177 @@
   fLoGainNumPickup                  =  -1;
 
-  fNumLoGainSamples                 =  -1.;
-
   fPed                              =  -1.;
   fPedRms                           =  -1.;
@@ -708 +706 @@
 }
 
-void MCalibrationChargePix::CalcLoGainPed()
-{
-
-    Float_t pedRmsSquare      = fPedRms * fPedRms;
-    Float_t pedRmsSquareVar   = fPedVar * pedRmsSquare; // fPedRmsErr = fPedErr/2.
-    
-    //
-    // We do not know the Lo Gain Pedestal RMS, so we have to retrieve it 
-    // from the HI GAIN (all calculation per slice up to now):  
-    //
-    // We extract the pure NSB contribution:
-    //
-    const Float_t elecRmsSquare    =    fElectronicPedRms    * fElectronicPedRms;
-    const Float_t elecRmsSquareVar = 4.*fElectronicPedRmsVar * elecRmsSquare;
-    
-    Float_t nsbSquare             =  pedRmsSquare    - elecRmsSquare;
-    Float_t nsbSquareRelVar       = (pedRmsSquareVar + elecRmsSquareVar)
-                                        / (nsbSquare * nsbSquare) ;
-    
-    if (nsbSquare < 0.)
-      nsbSquare = 0.;
-    
-    //
-    // Now, we divide the NSB by the conversion factor and 
-    // add it quadratically to the electronic noise
-    //
-    const Float_t conversionSquare        =    fConversionHiLo    * fConversionHiLo;
-    const Float_t convertedNsbSquare      =    nsbSquare       / conversionSquare;
-    const Float_t convertedNsbSquareVar   =    nsbSquareRelVar
-                                            * convertedNsbSquare * convertedNsbSquare;
-    
-    pedRmsSquare     = convertedNsbSquare    + elecRmsSquare;
-    pedRmsSquareVar  = convertedNsbSquareVar + elecRmsSquareVar;
-    
-    fLoGainPedRms    = TMath::Sqrt(pedRmsSquare);
-    fLoGainPedRmsVar = 0.25 * pedRmsSquareVar /  pedRmsSquare;
-
-}
 
 //
@@ -844 +804 @@
 
 
-void MCalibrationChargePix::ApplyLoGainConversion()
-{
-  
-  fElectronicPedRms       = gkElectronicPedRms    * TMath::Sqrt(fNumLoGainSamples);
-  fElectronicPedRmsVar    = gkElectronicPedRmsErr * gkElectronicPedRmsErr * fNumLoGainSamples;
-  
-  CalcLoGainPed();
-}
-
-
+void MCalibrationChargePix::CalcLoGainPedestal(Float_t logainsamples)
+{
+
+  fElectronicPedRms       = gkElectronicPedRms    * TMath::Sqrt(logainsamples);
+  fElectronicPedRmsVar    = gkElectronicPedRmsErr * gkElectronicPedRmsErr * logainsamples;
+  
+  Float_t pedRmsSquare      = fPedRms * fPedRms;
+  Float_t pedRmsSquareVar   = fPedVar * pedRmsSquare; // fPedRmsErr = fPedErr/2.
+  
+  //
+  // We do not know the Lo Gain Pedestal RMS, so we have to retrieve it 
+  // from the HI GAIN (all calculation per slice up to now):  
+  //
+  // We extract the pure NSB contribution:
+  //
+  const Float_t elecRmsSquare    =    fElectronicPedRms    * fElectronicPedRms;
+  const Float_t elecRmsSquareVar = 4.*fElectronicPedRmsVar * elecRmsSquare;
+  
+  Float_t nsbSquare             =  pedRmsSquare    - elecRmsSquare;
+  Float_t nsbSquareRelVar       = (pedRmsSquareVar + elecRmsSquareVar)
+                                 / (nsbSquare * nsbSquare) ;
+  
+  if (nsbSquare < 0.)
+    nsbSquare = 0.;
+  
+  //
+  // Now, we divide the NSB by the conversion factor and 
+  // add it quadratically to the electronic noise
+  //
+  const Float_t conversionSquare        =    fConversionHiLo    * fConversionHiLo;
+  const Float_t convertedNsbSquare      =    nsbSquare       / conversionSquare;
+  const Float_t convertedNsbSquareVar   =    nsbSquareRelVar
+                                            * convertedNsbSquare * convertedNsbSquare;
+    
+  pedRmsSquare     = convertedNsbSquare    + elecRmsSquare;
+  pedRmsSquareVar  = convertedNsbSquareVar + elecRmsSquareVar;
+  
+  fLoGainPedRms    = TMath::Sqrt(pedRmsSquare);
+  fLoGainPedRmsVar = 0.25 * pedRmsSquareVar /  pedRmsSquare;
+  
+}
+ 
+ 
+