Changeset 4362 for trunk

Timestamp:

06/29/04 11:10:51 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mpedestal/MPedCalcFromData.cc (modified) (6 diffs)
• mpedestal/MPedCalcFromData.h (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/06/29: Thomas Bretz
+
+   * mpedestal/MPedCalcFromData.[h,cc]
+     - changed data member names according to coding rules
+
+
+
  2004/06/25: Pepe Flix
 
@@ -112 +119 @@
      - make clone function virtual
 
-  * mjobs/MJCalibration.cc
+   * mjobs/MJCalibration.cc
      - adapted display for the datacheck    
   
@@ -130 +137 @@
   * mjobs/MJPedestal.[h,cc]
     - updated the data-check display
+
 
 

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromData.cc

@@ -62 +62 @@
     AddToBranchList("fHiGainFadcSamples");
 
-    SetRange(fgLoGainFirst, fgLoGainLast);
+    SetRange(fLoGainFirst, fLoGainLast);
     Clear();
 }
@@ -76 +76 @@
 void MPedCalcFromData::SetLoRange(Byte_t lofirst, Byte_t lolast)
 {
-    fgLoGainFirst = lofirst;
-    fgLoGainLast = lolast;
+    fLoGainFirst = lofirst;
+    fLoGainLast = lolast;
     
     fWindowSizeLoGain = lolast - lofirst;
@@ -141 +141 @@
       const UInt_t idx    = pixel.GetPixelId();
       
-      if ( (UInt_t)pixel.GetMaxHiGainSample() < HighGainThreshold ) {
+      if ( (UInt_t)pixel.GetMaxHiGainSample() < fHiGainThreshold ) {
           
           fEvtCounter[idx]++;
@@ -167 +167 @@
           fSumx2[idx]          += sqrsum;
 
-          if (fEvtCounter[idx] == fgDump){
+          if ((UInt_t)fEvtCounter[idx] == fDump){
               
               // Compute pedestals and rms from the sample
-              const ULong_t n     = fWindowSizeLoGain*fgDump;
+              const ULong_t n     = fWindowSizeLoGain*fDump;
 
               const Float_t sum  = fSumx.At(idx);
@@ -177 +177 @@
 
               // 1. Calculate the Variance of the sums:
-              Float_t higainVar = (sum2-sum*sum/fgDump)/(fgDump-1.);
+              Float_t higainVar = (sum2-sum*sum/fDump)/(fDump-1.);
               // 2. Scale the variance to the number of slices:
               higainVar /= (Float_t)(fWindowSizeLoGain);
@@ -196 +196 @@
 }
 
-
-Int_t MPedCalcFromData::PostProcess()
-{
-  return kTRUE;
-}

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromData.h

@@ -22 +22 @@
 #endif
 
-#ifndef MARS_MTask
-#include "MTask.h"
-#endif
-
 #ifndef MARS_MExtractor
 #include "MExtractor.h"
@@ -33 +29 @@
 {
 
-    UInt_t fgDump; // Number for dumping.
-    Byte_t fgLoGainFirst;      // First FADC slice Lo-Gain (currently set to: 3) 
-    Byte_t fgLoGainLast;       // Last FADC slice Lo-Gain (currently set to: 14) 
+    UInt_t fDump; // Number for dumping.
+    Byte_t fLoGainFirst;      // First FADC slice Lo-Gain (currently set to: 3) 
+    Byte_t fLoGainLast;       // Last FADC slice Lo-Gain (currently set to: 14) 
     Byte_t fWindowSizeLoGain;             // Number of Lo Gain slices in window
-    Byte_t HighGainThreshold;
+    Byte_t fHiGainThreshold;
 
     TArrayD fSumx;         // sum of values
@@ -48 +44 @@
     Bool_t ReInit     ( MParList *pList );
     Int_t  Process    ();
-    Int_t  PostProcess();
 
 public:
@@ -55 +50 @@
  
     void Clear(const Option_t *o="");
-    void SetDumpEvents(UInt_t dumpevents = 0){fgDump = dumpevents;}
-    void SetHighGainThreshold(Byte_t Threshold = 0){HighGainThreshold = Threshold;}
+    void SetDumpEvents(UInt_t dumpevents = 0){fDump = dumpevents;}
+    void SetfHiGainThreshold(Byte_t Threshold = 0){fHiGainThreshold = Threshold;}
     void SetLoRange(Byte_t lofirst=0, Byte_t lolast=0);