Changeset 2641 for trunk/MagicSoft/Mars/manalysis

Timestamp:

12/11/03 14:01:52 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MExtractedSignalPix.cc (modified) (3 diffs)
• MExtractedSignalPix.h (modified) (4 diffs)

trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.cc

@@ -41 +41 @@
 
 MExtractedSignalPix::MExtractedSignalPix(const char* name, const char* title)
-  : fExtractedSignal(-1.),
-    fExtractedSignalError(-1.),
+  : fExtractedSignalHiGain(-1.),
+    fExtractedSignalHiGainError(-1.),
+    fExtractedSignalLoGain(-1.),
+    fExtractedSignalLoGainError(-1.),
     fIsLoGainUsed(kFALSE),
     fNumHiGainSaturated(0),
@@ -62 +64 @@
 {
 
-  fExtractedSignal = -1.;
-  fExtractedSignalError = -1.;
+  fExtractedSignalHiGain = -1.;
+  fExtractedSignalHiGainError = -1.;
   fIsLoGainUsed = kFALSE;
   fNumHiGainSaturated = 0;
@@ -75 +77 @@
   *fLog << all << GetDescriptor() << ":" << endl;
 
-  *fLog << " Signal: " << fExtractedSignal 
-        << " +- " << fExtractedSignalError
+  *fLog << " Signal: " << fExtractedSignalHiGain
+        << " +- " << fExtractedSignalHiGainError
         << " LoGain? " << fIsLoGainUsed
         << " Nr. Sat. Hi Gain: " <<  fNumHiGainSaturated

trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h

@@ -10 +10 @@
 private:
 
-    Float_t fExtractedSignal;      // mean value of the extracted signal
-    Float_t fExtractedSignalError; // error of the mean value of the extracted signal
+    Float_t fExtractedSignalHiGain;      // mean value of the extracted signal
+    Float_t fExtractedSignalHiGainError; // error of the mean value of the extracted signal
+    Float_t fExtractedSignalLoGain;      // mean value of the extracted signal
+    Float_t fExtractedSignalLoGainError; // error of the mean value of the extracted signal
     Bool_t fIsLoGainUsed;
     Byte_t fNumHiGainSaturated;
@@ -25 +27 @@
     void Clear(Option_t *o="");
 
-    Float_t GetExtractedSignal()      const   { return fExtractedSignal; }
-    Float_t GetExtractedSignalError() const   { return fExtractedSignalError; }
+    Float_t GetExtractedSignalHiGain()      const   { return fExtractedSignalHiGain; }
+    Float_t GetExtractedSignalHiGainError() const   { return fExtractedSignalHiGainError; }
+
+    Float_t GetExtractedSignalLoGain()      const   { return fExtractedSignalLoGain; }
+    Float_t GetExtractedSignalLoGainError() const   { return fExtractedSignalLoGainError; }
 
     Float_t GetMeanArrivalTime()      const   { return fMeanArrivalTime; }
@@ -33 +38 @@
     void SetExtractedSignal(Float_t sig, Float_t sigerr)   
                                         { 
-                                          fExtractedSignal = sig; 
-                                          fExtractedSignalError = sigerr; 
+                                          fExtractedSignalHiGain = sig; 
+                                          fExtractedSignalHiGainError = sigerr; 
+                                        }
+
+    void SetExtractedSignal(Float_t sighi, Float_t sighierr,Float_t siglo, Float_t sigloerr)   
+                                        { 
+                                          fExtractedSignalHiGain = sighi; 
+                                          fExtractedSignalHiGainError = sighierr; 
+                                          fExtractedSignalLoGain = siglo; 
+                                          fExtractedSignalLoGainError = sigloerr; 
                                         }
 
@@ -49 +62 @@
     Bool_t IsLoGainUsed()               { return fIsLoGainUsed; }
 
-    Bool_t IsValid() const              { return fExtractedSignal >= 0 || fExtractedSignalError >= 0; }
+    Bool_t IsValid() const              { return fExtractedSignalHiGain >= 0. || fExtractedSignalHiGainError >= 0.; }
 
     void PrintOut();