Changeset 2767 for trunk/MagicSoft

Timestamp:

01/12/04 10:37:11 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MExtractSignal.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -9 +9 @@
     - replace logainshift by two independent variables: 
       logainfirst, logainlast
+    - because in most data, maximum occurs in slice 4, shift default 
+      from slices 4-9 to slices 3-8.
 
 

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -56 +56 @@
 // Default constructor. 
 //
-MExtractSignal::MExtractSignal(/*const Byte_t first, const Byte_t last, const Byte_t logainshift,*/
-                    const char *name, const char *title)
-  : /*fNumHiGainSamples(last-first+1), fNumLoGainSamples(last-first+1),*/
-    fSaturationLimit(254)
+MExtractSignal::MExtractSignal(const char *name, const char *title)
+  : fSaturationLimit(254)
 {
 
@@ -68 +66 @@
 
     SetRange();
-    /*
-     fFirst       = first;
-     fLoGainFirst = first+logainshift;
-
-     fSqrtHiGainSamples = TMath::Sqrt((Float_t)fNumHiGainSamples);
-     fSqrtLoGainSamples = TMath::Sqrt((Float_t)fNumLoGainSamples);
-     */
-}
-
-void MExtractSignal::SetRange(Byte_t first, Byte_t last, Byte_t logainshift)
-{
-    fNumHiGainSamples = last-first+1;
-    fNumLoGainSamples = last-first+1;
-
-    fFirst       = first;
-    fLoGainFirst = first+logainshift;
+}
+
+void MExtractSignal::SetRange(Byte_t hifirst, Byte_t hilast, Byte_t lofirst, Byte_t lolast)
+{
+
+    fNumHiGainSamples = hilast-hifirst+1;
+    fNumLoGainSamples = lolast-lofirst+1;
+
+    fHiGainFirst = hifirst;
+    fLoGainFirst = lofirst;
 
     fSqrtHiGainSamples = TMath::Sqrt((Float_t)fNumHiGainSamples);
@@ -144 +136 @@
     fSignals->InitSize(cam->GetNumPixels());    
 
-    fSignals->SetNumUsedFADCSlices(fNumHiGainSamples, fFirst, fFirst+fNumHiGainSamples-1,
-                                   fNumLoGainSamples, fFirst, fFirst+fNumLoGainSamples-1);
+    fSignals->SetNumUsedFADCSlices(fNumHiGainSamples, fHiGainFirst, fHiGainFirst+fNumHiGainSamples-1,
+                                   fNumLoGainSamples, fLoGainFirst, fLoGainFirst+fNumLoGainSamples-1);
 
     return kTRUE;
@@ -167 +159 @@
 
         Byte_t *ptr   = pixel.GetHiGainSamples();
-        Byte_t *first = ptr + fFirst;
-        Byte_t *last  = ptr + fFirst + fNumHiGainSamples;
+        Byte_t *first = ptr + fHiGainFirst;
+        Byte_t *last  = ptr + fHiGainFirst + fNumHiGainSamples;
 
         UInt_t  sumHi   = 0;
@@ -200 +192 @@
 
         ptr   = pixel.GetLoGainSamples();
-        first = ptr + fLoGainFirst + 1;
-        last  = ptr + fLoGainFirst + fNumLoGainSamples +1;
+        first = ptr + fLoGainFirst;
+        last  = ptr + fLoGainFirst + fNumLoGainSamples;
         Byte_t maxlo  = 0;
         Byte_t midlo  = 0;
@@ -228 +220 @@
                                pedrms*fSqrtHiGainSamples,
                                ((Float_t)sumLo - pedes*(Float_t)fNumLoGainSamples),
-                               pedrms*fSqrtLoGainSamples
-                               );
+                               pedrms*fSqrtLoGainSamples);
 
         pix.SetGainSaturation(satHi, satHi, satLo);
@@ -235 +226 @@
         // FIXME: Arrival time has to be stored in MArrivalTime!
         if (satHi)
-          pix.SetArrivalTimes((Float_t)(midlo+fFirst),0.,0.);
+          pix.SetArrivalTimes((Float_t)(midlo+fLoGainFirst),0.,0.);
         else
-          pix.SetArrivalTimes((Float_t)(midhi+fLoGainFirst),0.,0.);
+          pix.SetArrivalTimes((Float_t)(midhi+fHiGainFirst),0.,0.);
 
       } /* while (pixel.Next()) */