Changeset 3924 for trunk/MagicSoft/Mars

Timestamp:

05/01/04 12:28:43 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
    * macros/dohtml.C
      - include directory mpedestal
+
+   * msignal/MExtractFixedWindow.[h,cc]
+   * msignal/MExtractSlidingWindow.[h,cc]
+   * msignal/MExtractFixedWindowPeakSearch.[h,cc]
+   * msignal/MExtractor.[h,cc]
+     - include the possibility to set the range for the hi-gain outside
+       the range of MRawEvtPixelIter::GetNumHiGainSamples() and to take 
+       the "low-gain" slices instead. This is necessary for the March 
+       data!
 
 

trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.cc

@@ -61 +61 @@
 // Default constructor. 
 //
-// Calls: 
-// - SetRange(fgHiGainFirst, fgHiGainLast, fgLoGainFirst, fgLoGainLast)
-//
 MExtractFixedWindow::MExtractFixedWindow(const char *name, const char *title)
 {
   fName  = name  ? name  : "MExtractFixedWindow";
   fTitle = title ? title : "Signal Extractor for a fixed FADC window";
-
 
   SetRange(fgHiGainFirst, fgHiGainLast, fgLoGainFirst, fgLoGainLast);
@@ -154 +150 @@
 // - If *ptr is greater than fSaturationLimit, raise sat by 1
 // 
-void MExtractFixedWindow::FindSignalHiGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
+void MExtractFixedWindow::FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &sum, Byte_t &sat) const
 {
 
@@ -169 +165 @@
         sat++;
     }
+
+  if (fHiLoLast == 0)
+    return;
+  
+  end = logain + fHiLoLast;
+  while (logain<end)
+    {
+      sum += *logain;
+      
+      if (*logain++ >= fSaturationLimit)
+            sat++;
+    }
+
 }
 

trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.h

@@ -22 +22 @@
   static const Byte_t fgLoGainLast;      // Last FADC slice Lo-Gain (currently set to: 14) 
 
-  void   FindSignalHiGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;
+  void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &sum, Byte_t &sat) const;
   void   FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;
 

trunk/MagicSoft/Mars/msignal/MExtractSlidingWindow.h

@@ -20 +20 @@
   Byte_t  fWindowSizeLoGain;             // Number of Lo Gain slices in window  
   
-  void   FindSignalHiGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const;
+  void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &max, Byte_t &sat) const;
   void   FindSignalLoGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const;  
 

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -85 +85 @@
 MExtractor::MExtractor(const char *name, const char *title)
     : fPedestals(NULL), fSignals(NULL), fRawEvt(NULL), fRunHeader(NULL),
-      fNumHiGainSamples(0.), fNumLoGainSamples(0.), fSaturationLimit(fgSaturationLimit)
+      fHiLoLast(0), fNumHiGainSamples(0.), fNumLoGainSamples(0.), 
+      fSaturationLimit(fgSaturationLimit)
 {
 
@@ -158 +159 @@
 // -  MRawRunHeader::GetNumSamplesLoGain()
 //
-// In case that the variables fHiGainLast and fLoGainLast are smaller than 
+// In case that the variable fLoGainLast is smaller than 
 // the even part of the number of samples obtained from the run header, a
 // warning is given an the range is set back accordingly. A call to:  
-// - SetRange(fHiGainFirst, fHiGainLast-diff, fLoGainFirst, fLoGainLast) or 
 // - SetRange(fHiGainFirst, fHiGainLast, fLoGainFirst, fLoGainLast-diff) 
 // is performed in that case. The variable diff means here the difference 
-// between the requested range (fHiGainLast) and the available one. Note that 
+// between the requested range (fLoGainLast) and the available one. Note that 
 // the functions SetRange() are mostly overloaded and perform more checks, 
 // modifying the ranges again, if necessary.
+//
+// In case that the variable fHiGainLast is smaller than the available range 
+// obtained from the run header, a warning is given that a part of the low-gain 
+// samples are used for the extraction of the high-gain signal. 
 //
 // Call: 
@@ -175 +179 @@
 {
   
-  Int_t lastdesired   = (Int_t)fHiGainLast;
-  Int_t lastavailable = (Int_t)fRunHeader->GetNumSamplesHiGain()-1;
-  
-  if (lastdesired > lastavailable)
-    {
-      const Int_t diff = lastdesired - lastavailable;
-      *fLog << endl;
-      *fLog << warn << GetDescriptor()
-            << Form("%s%2i%s%2i%s%2i%s",": Selected Hi Gain FADC Window [",
-                    (int)fHiGainFirst,",",lastdesired,
-                    "] ranges out of the available limits: [0,",lastavailable,"].") << endl;
-      *fLog << GetDescriptor() << ": Will reduce the upper edge to " << (int)(fHiGainLast - diff) << endl;
-      SetRange(fHiGainFirst, fHiGainLast-diff, fLoGainFirst, fLoGainLast);
-    }
-
-  lastdesired   = (Int_t)(fLoGainLast);
-  lastavailable = (Int_t)fRunHeader->GetNumSamplesLoGain()-1;
+  Int_t lastdesired   = (Int_t)(fLoGainLast);
+  Int_t lastavailable = (Int_t)fRunHeader->GetNumSamplesLoGain()-1;
   
   if (lastdesired > lastavailable)
@@ -205 +194 @@
     }
 
-  fSignals->SetUsedFADCSlices(fHiGainFirst, fHiGainLast, fNumHiGainSamples,
+  lastdesired   = (Int_t)fHiGainLast;
+  lastavailable = (Int_t)fRunHeader->GetNumSamplesHiGain()-1;
+  
+  if (lastdesired > lastavailable)
+    {
+      const Int_t diff = lastdesired - lastavailable;
+      *fLog << endl;
+      *fLog << warn << GetDescriptor()
+            << Form("%s%2i%s%2i%s%2i%s",": Selected Hi Gain FADC Window [",
+                    (int)fHiGainFirst,",",lastdesired,
+                    "] ranges out of the available limits: [0,",lastavailable,"].") << endl;
+      *fLog << warn << GetDescriptor() 
+            << Form("%s%2i%s",": Will use ",diff," samples from the Low-Gain for the High-Gain extraction")
+            << endl;
+      fHiGainLast -= diff;
+      fHiLoLast    = diff;
+    }
+
+
+  fSignals->SetUsedFADCSlices(fHiGainFirst, fHiGainLast+fHiLoLast, fNumHiGainSamples,
                               fLoGainFirst, fLoGainLast, fNumLoGainSamples);
 
@@ -213 +221 @@
 
 
-void MExtractor::FindSignalHiGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const
+void MExtractor::FindSignalHiGain(Byte_t *firstused, Byte_t *logain, Int_t &sum, Byte_t &sat) const
 {
   return;
@@ -239 +247 @@
       Byte_t sathi;
 
-      FindSignalHiGain(pixel.GetHiGainSamples()+fHiGainFirst, sumhi, sathi);
+      FindSignalHiGain(pixel.GetHiGainSamples()+fHiGainFirst, pixel.GetLoGainSamples(), sumhi, sathi);
 
       Int_t  sumlo = 0;

trunk/MagicSoft/Mars/msignal/MExtractor.h

@@ -31 +31 @@
     MRawRunHeader       *fRunHeader;    // RunHeader information
 
-    Byte_t  fHiGainFirst;
-    Byte_t  fLoGainFirst;
+    Byte_t   fHiGainFirst;
+    Byte_t   fLoGainFirst;
 
-    Byte_t  fHiGainLast;
-    Byte_t  fLoGainLast;
+    Byte_t   fHiGainLast;
+    Byte_t   fLoGainLast;
 
+    Byte_t   fHiLoLast;
+    
     Float_t  fNumHiGainSamples;
     Float_t  fNumLoGainSamples;
@@ -45 +47 @@
     Byte_t  fSaturationLimit;
 
-    virtual void FindSignalHiGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const;
+    virtual void FindSignalHiGain(Byte_t *firstused, Byte_t *lowgain, Int_t &sum, Byte_t &sat) const;
     virtual void FindSignalLoGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const;