Changeset 5334

Timestamp:

11/02/04 12:40:38 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/11/01: Markus Gaug
+
+   * msignal/MExtractTimeAndChageDigitalFilter.cc
+     - delete the pointer to derivativelo and derivativehi at the end of 
+       the function
+     - reduce the effective number of high-gain samples (used for the 
+       calculation of the pedestal RMS in the calibration) from 6. to 
+       2.5
+
 
  2004/11/01: Markus Meyer and Keiichi Mase

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -167 +167 @@
     }
   
-  fNumHiGainSamples = (Float_t)fWindowSizeHiGain;
-  fNumLoGainSamples = (Float_t)fWindowSizeLoGain;
+  // 
+  // We need here the effective number of samples which is about 2.5 in the case of a window
+  // size of 6. The exact numbers have to be found still.
+  //
+  fNumHiGainSamples = (Float_t)fWindowSizeHiGain/2.5;
+  fNumLoGainSamples = (Float_t)fWindowSizeLoGain/2.5;
   fSqrtHiGainSamples = TMath::Sqrt(fNumHiGainSamples);
   fSqrtLoGainSamples = TMath::Sqrt(fNumLoGainSamples);
@@ -803 +807 @@
   // Low Gain histograms
   //
+  TH1F *derivativelo = NULL;
   if (shapelo)
     {
@@ -808 +813 @@
       binwidth = shapelo->GetBinWidth(1);
       
-      TH1F *derivativelo = new TH1F(Form("%s%s",shapelo->GetName(),"_der"),
-                                    Form("%s%s",shapelo->GetTitle()," derivative"),
-                                    nbinslo,
-                                    shapelo->GetBinLowEdge(1),
-                                    shapelo->GetBinLowEdge(nbinslo)+binwidth);
+      derivativelo = new TH1F(Form("%s%s",shapelo->GetName(),"_der"),
+                              Form("%s%s",shapelo->GetTitle()," derivative"),
+                              nbinslo,
+                              shapelo->GetBinLowEdge(1),
+                              shapelo->GetBinLowEdge(nbinslo)+binwidth);
       
       //
@@ -923 +928 @@
     }
   
-
   ofstream fn(filename.Data());
 
@@ -937 +941 @@
   for (Int_t i=0; i<nsizehi; i++)
     fn << "\t" << fAmpWeightsLoGain[i] << "\t" << fTimeWeightsLoGain[i] << endl;
+
+  delete derivativehi;
+  if (derivativelo)
+    delete derivativelo;
 
   return kTRUE;