Changeset 2634 for trunk/MagicSoft/Mars/manalysis

Timestamp:

12/10/03 14:18:49 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCalibrationCalc.cc (modified) (1 diff)
• MCalibrationPix.cc (modified) (3 diffs)
• MExtractSignal.h (modified) (1 diff)
• MExtractedSignalPix.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MCalibrationCalc.cc

@@ -304 +304 @@
 
         MExtractedSignalPix &sig =  (*fSignals)[pixid];
-        Float_t sum = sig.GetExtractedSignal();
+
+        Float_t sum    = sig.GetExtractedSignal();
         Bool_t  logain = sig.IsLoGainUsed();
 

trunk/MagicSoft/Mars/manalysis/MCalibrationPix.cc

@@ -102 +102 @@
 
   if (fPed && fPedRms)
-    fHist->SetLowerFitRange(3.5*fPedRms);
-  //    fHist->SetLowerFitRange(fPed + 3.5*fPedRms);
+    fHist->SetLowerFitRange(1.5*fPedRms);
+
   else
     *fLog << warn << "Cannot set lower fit range to suppress cosmics: Pedestals not available" << endl;
@@ -116 +116 @@
           *fLog << warn << "Could not fit Lo Gain charges of pixel " << fPixId << endl;
           fHist->PrintChargeFitResult();
-          return kFALSE;
+          //      return kFALSE;
         }
     }
@@ -125 +125 @@
           *fLog << warn << "Could not fit Hi Gain charges of pixel " << fPixId << endl;
           fHist->PrintChargeFitResult();
-          return kFALSE;
+          //      return kFALSE;
         }
     }

trunk/MagicSoft/Mars/manalysis/MExtractSignal.h

@@ -41 +41 @@
 
   Bool_t ReInit(MParList *pList); 
-  Int_t PreProcess(MParList *pList);
-  Int_t Process();
-  Int_t PostProcess();
+  Int_t  PreProcess(MParList *pList);
+  Int_t  Process();
+  Int_t  PostProcess();
   
 public:

trunk/MagicSoft/Mars/manalysis/MExtractedSignalPix.h

@@ -16 +16 @@
     Byte_t fNumLoGainSaturated;
 
+    Float_t fMeanArrivalTime;
+    Float_t fWidthArrivalTime;
+
 public:
 
@@ -25 +28 @@
     Float_t GetExtractedSignalError() const   { return fExtractedSignalError; }
 
-    void SetExtractedSignal(Float_t sig, Float_t sigerr)   { fExtractedSignal = sig; fExtractedSignalError = sigerr; }
+    Float_t GetMeanArrivalTime()      const   { return fMeanArrivalTime; }
+    Float_t GetWidthArrivalTime()     const   { return fWidthArrivalTime; }
+
+    void SetExtractedSignal(Float_t sig, Float_t sigerr)   
+                                        { 
+                                          fExtractedSignal = sig; 
+                                          fExtractedSignalError = sigerr; 
+                                        }
+
     void SetGainSaturation(Bool_t sat, Byte_t higain, Byte_t logain) 
                                         { fIsLoGainUsed = sat; 
                                           fNumHiGainSaturated = higain;  
                                           fNumLoGainSaturated = logain; }
+
+    void SetArrivalTimes(Float_t mean, Float_t width) 
+                                     { fMeanArrivalTime = mean;
+                                       fWidthArrivalTime  = width;
+                                     }
 
     Bool_t IsLoGainUsed()               { return fIsLoGainUsed; }