Changeset 8258 for trunk/MagicSoft/Mars

Timestamp:

01/16/07 14:12:57 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractedSignalPix.h (modified) (2 diffs)
• msignal/MExtractor.cc (modified) (6 diffs)
• msignal/MExtractor.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -37 +37 @@
      - removed code from Process function
      - increased version number to 7
+
+   * msignal/MExtractedSignalPix.h:
+     - some simple reordering in the class header
 
 

trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.h

@@ -18 +18 @@
   Byte_t fNumLoGainSaturated;          // Number of how many lo-gain slices saturated
 
-  Byte_t GetNumHiGainSaturated() const { return fNumHiGainSaturated; }
-  Byte_t GetNumLoGainSaturated() const { return fNumLoGainSaturated; }
-
 public:
   MExtractedSignalPix(const char* name=NULL, const char* title=NULL);
@@ -39 +36 @@
   Float_t GetExtractedSignalLoGainError() const { return fExtractedSignalLoGainError;  }
 
+  Byte_t GetNumHiGainSaturated()          const { return fNumHiGainSaturated; }
+  Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated; }
+
   Bool_t IsHiGainSaturated()              const { return fNumHiGainSaturated>0;        }
   Bool_t IsLoGainSaturated()              const { return fNumLoGainSaturated>0;        }

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -64 +64 @@
 //End_Html
 //
+//
 // Class Version 6:
-//  +Float_t fResolutionPerPheHiGain; // Extractor-dependent charge resolution per phe for high-gain (see TDAS-0502).
-//  +Float_t fResolutionPerPheLoGain; // Extractor-dependent charge resolution per phe for low-gain  (see TDAS-0502).
+// ----------------
+//  + Float_t fResolutionPerPheHiGain; // Extractor-dependent charge resolution per phe for high-gain (see TDAS-0502).
+//  + Float_t fResolutionPerPheLoGain; // Extractor-dependent charge resolution per phe for low-gain  (see TDAS-0502).
+//
+// Class Version 7:
+// ----------------
+//  - Byte_t fHiLoLast;                // Number of slices in fLoGainSamples counted for the High-Gain signal
 //
 //
@@ -119 +125 @@
 // - fNoiseCalculation to kFALSE 
 //
-// Call:
-// -  AddToBranchList("MRawEvtData.*")
-//
 MExtractor::MExtractor(const char *name, const char *title)
     : fResolutionPerPheHiGain(0), fResolutionPerPheLoGain(0),
@@ -131 +134 @@
     fTitle = title ? title : "Base class for signal extractors";
 
-    AddToBranchList("MRawEvtData.*");
-
     SetNamePedestalCam();
     SetNameSignalCam();
@@ -142 +143 @@
 void MExtractor::SetRange(Byte_t hifirst, Byte_t hilast, Byte_t lofirst, Byte_t lolast)
 {
- 
-  Clear();
-
-  fHiGainFirst = hifirst;
-  fHiGainLast  = hilast;
-  
-  fLoGainFirst = lofirst;
-  fLoGainLast  = lolast;
+    fHiGainFirst = hifirst;
+    fHiGainLast  = hilast;
+
+    fLoGainFirst = lofirst;
+    fLoGainLast  = lolast;
 }
 
@@ -324 +322 @@
 Int_t MExtractor::Process()
 {
-
+    return kERROR;
+/*
   MRawEvtPixelIter pixel(fRawEvt);
 
@@ -353 +352 @@
       pix.SetGainSaturation(sathi, satlo);
       
-    } /* while (pixel.Next()) */
+    }
 
     fSignals->SetReadyToSave();
 
     return kTRUE;
+    */
 }
 

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -121 +121 @@
   void Print(Option_t *o="") const; //*MENU*
 
-  ClassDef(MExtractor, 6) // Signal Extractor Base Class
+  ClassDef(MExtractor, 7) // Signal Extractor Base Class
 };