Changeset 6742

Timestamp:

03/04/05 11:36:43 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeAndChargeSpline.cc (modified) (15 diffs)
• msignal/MExtractTimeAndChargeSpline.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
      - removed the obsolete parts of "kMaximum" and "kHalfMaximum" in the
        code which were still persistent
+     - set default extraction type to integral (instead of amplitude)
+
 
  2005/03/04 Abelardo Moralejo

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc

@@ -176 +176 @@
     : fAbMax(0.), fAbMaxPos(0.), fHalfMax(0.), 
       fRiseTimeHiGain(fgRiseTimeHiGain), fFallTimeHiGain(fgFallTimeHiGain),
-      fRandomIter(0)
+      fRandomIter(0), fExtractionType(kIntegral)
 {
 
@@ -186 +186 @@
   SetOffsetLoGain(fgOffsetLoGain);
 
-  SetChargeType();
   SetRange(fgHiGainFirst, fgHiGainLast, fgLoGainFirst, fgLoGainLast);
 }
@@ -203 +202 @@
   MExtractor::SetRange(hifirst, hilast, lofirst, lolast);
 
-  if (IsExtractionType(kIntegral))
-    SetChargeType(kIntegral);
-  if (IsExtractionType(kAmplitude))
-    SetChargeType(kAmplitude);
-  
+  SetChargeType(fExtractionType);
 }
 
@@ -221 +216 @@
 {
 
-  CLRBIT(fFlags,kAmplitude);
-  CLRBIT(fFlags,kIntegral );
-
-  SETBIT(fFlags,typ);
-
-  if (IsExtractionType(kAmplitude))
+  fExtractionType = typ;
+
+  if (fExtractionType == kAmplitude)
     {
       fNumHiGainSamples = 1.;
@@ -239 +231 @@
     }
 
-  if (IsExtractionType(kIntegral))
+  if (fExtractionType == kIntegral)
     {
 
@@ -283 +275 @@
   fLoGainSecondDeriv.Reset();
   
-  if (IsExtractionType(kAmplitude))
+  if (fExtractionType == kAmplitude)
     {
       fNumHiGainSamples = 1.;
@@ -297 +289 @@
   fFallTimeLoGain    = fFallTimeHiGain * fLoGainStretch;      
 
-  if (IsExtractionType(kIntegral))
+  if (fExtractionType == kIntegral)
     {
 
@@ -416 +408 @@
       const Float_t nsx = fRandomIter * fResolution;
 
-      if (IsExtractionType(kAmplitude))
+      if (fExtractionType == kAmplitude)
         {
           const Float_t b = nsx;
@@ -453 +445 @@
 
       dtime = 1.0;
-      if (IsExtractionType(kAmplitude))
+      if (fExtractionType == kAmplitude)
         {
           sum  = fAbMax;
@@ -615 +607 @@
     }
 
-  if (IsExtractionType(kAmplitude))
+  if (fExtractionType == kAmplitude)
     {
       time  = fAbMaxPos + (Int_t)fHiGainFirst;
@@ -775 +767 @@
       const Float_t nsx = fRandomIter * fResolution;
 
-      if (IsExtractionType(kAmplitude))
+      if (fExtractionType == kAmplitude)
         {
           const Float_t b = nsx;
@@ -811 +803 @@
 
       dtime = 1.0;
-      if (IsExtractionType(kAmplitude))
+      if (fExtractionType == kAmplitude)
         {
           time = (Float_t)(fLoGainFirst + maxpos);
@@ -976 +968 @@
     }
 
-  if (IsExtractionType(kAmplitude))
+  if (fExtractionType == kAmplitude)
     {
       time = fAbMaxPos + (Int_t)fLoGainFirst;
@@ -1214 +1206 @@
     }
   
-  Bool_t b = kFALSE;
-
-  if (IsEnvDefined(env, prefix, "Amplitude", print))
-  {
-      b = GetEnvValue(env, prefix, "Amplitude", IsExtractionType(kAmplitude));
-      if (b)
-          SetChargeType(kAmplitude);
-      rc = kTRUE;
-  }
-  if (IsEnvDefined(env, prefix, "Integral", print))
-  {
-      b = GetEnvValue(env, prefix, "Integral", IsExtractionType(kIntegral));
-      if (b)
-          SetChargeType(kIntegral);
-      rc = kTRUE;
-  }
-
   if (IsEnvDefined(env, prefix, "ExtractionType", print))
   {
@@ -1240 +1215 @@
       if (type==(TString)"integral")
           SetChargeType(kIntegral);
-      if (type==(TString)"maximum")
-          SetChargeType(kMaximum);
-      if (type==(TString)"halfmaximum")
-          SetChargeType(kHalfMaximum);
       rc=kTRUE;
   }
 
-
-
-
   return MExtractTimeAndCharge::ReadEnv(env, prefix, print) ? kTRUE : rc;
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.h

@@ -48 +48 @@
   Int_t   fRandomIter;                  // Counter used to randomize weights for noise calculation
   
-  Byte_t  fFlags;                       // Bit-field to hold the time extraction types
-  
-  Int_t  ReadEnv(const TEnv &env, TString prefix, Bool_t print);
+  Int_t   ReadEnv(const TEnv &env, TString prefix, Bool_t print);
 
-  Bool_t InitArrays();
+  Bool_t  InitArrays();
   
   void CalcIntegralHiGain(Float_t &sum, Float_t start, Float_t last);
   void CalcIntegralLoGain(Float_t &sum, Float_t start, Float_t last);
 
-public:
-
-  enum ExtractionType_t { kMaximum,   kHalfMaximum,
-                          kAmplitude, kIntegral    };    //! Possible time and charge extraction types
+public:  
+  enum ExtractionType_t { kAmplitude, kIntegral };    //! Possible time and charge extraction types
 
 private:
+  
+  ExtractionType_t fExtractionType;
 
-  Bool_t IsExtractionType ( ExtractionType_t typ )  { return TESTBIT(fFlags, typ); }
-  
 public:
 
@@ -95 +91 @@
   void SetLoGainStretch ( const Float_t f=fgLoGainStretch    )  { fLoGainStretch = f;   }
   
-  void SetChargeType ( const ExtractionType_t typ=kAmplitude);
+  void SetChargeType ( const ExtractionType_t typ=kIntegral);
   
   void FindTimeAndChargeHiGain(Byte_t *first, Byte_t *logain, Float_t &sum, Float_t &dsum,