Changeset 6769 for trunk/MagicSoft/Mars/msignal

Timestamp:

03/07/05 17:46:37 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MArrivalTime.h (modified) (1 diff)
• MExtractTimeAndChargeSpline.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/msignal/MArrivalTime.h

@@ -42 +42 @@
     void Print(Option_t *o="") const;
 
-    // Do not do such things! It is highly dangerous to use two very similar operators
-    // to do completely different things! People won't recognize it...
-    //Double_t operator()(int i) { return fDataErr[i]; }
-
     Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
     void DrawPixelContent(Int_t num) const;

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc

@@ -175 +175 @@
 MExtractTimeAndChargeSpline::MExtractTimeAndChargeSpline(const char *name, const char *title) 
     : fAbMax(0.), fAbMaxPos(0.), fHalfMax(0.), 
-      fRiseTimeHiGain(fgRiseTimeHiGain), fFallTimeHiGain(fgFallTimeHiGain),
       fRandomIter(0), fExtractionType(kIntegral)
 {
@@ -185 +184 @@
   SetLoGainStretch();
   SetOffsetLoGain(fgOffsetLoGain);
+
+  SetRiseTimeHiGain();
+  SetFallTimeHiGain();
 
   SetRange(fgHiGainFirst, fgHiGainLast, fgLoGainFirst, fgLoGainLast);
@@ -241 +243 @@
       fSqrtLoGainSamples = TMath::Sqrt(fNumLoGainSamples);
       fWindowSizeHiGain  = (Int_t)(fRiseTimeHiGain + fFallTimeHiGain);
-      fWindowSizeLoGain  = (Int_t)(fRiseTimeLoGain + fFallTimeLoGain);
+      fWindowSizeLoGain  = (Int_t)((fRiseTimeLoGain + fFallTimeLoGain)*fLoGainStretch);
       //      fNumLoGainSamples  *= 0.75;      
     }