Changeset 8357 for trunk/MagicSoft/Mars/msignal

Timestamp:

03/03/07 22:33:56 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractBlindPixel.cc (modified) (1 diff)
• MSignalCalc.cc (modified) (7 diffs)
• MSignalCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -658 +658 @@
       {
           // FIXME: fLoGain* is used to determine the FILTER/CHECK range
-          const Int_t numh = pixel.GetNumHiGainSamples();
+          const Int_t numh = fRunHeader->GetNumSamplesHiGain();
 
           const Int_t sum = fSignal->GetIntegralRaw(fBlindPixelIdx[id], fLoGainFirst+numh, fLoGainLast+numh);

trunk/MagicSoft/Mars/msignal/MSignalCalc.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@uni-sw.gwdg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Author(s): Thomas Bretz  12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -115 +115 @@
     // This must be done in ReInit because in PreProcess the
     // headers are not available
-    const MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
-    if (!runheader)
-        *fLog << warn << dbginf << "Warning - cannot check file type, MRawRunHeader not found." << endl;
-    else
-    {
-        if (runheader->IsMonteCarloRun())
-            return kTRUE;
-    }
+    if (fRunHeader->IsMonteCarloRun())
+        return kTRUE;
 
     fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
-    if (runheader && !fPedestals)
+    if (!fPedestals)
         return kFALSE;
 
@@ -144 +138 @@
         Byte_t *ptr   = pixel.GetHiGainSamples();
         Byte_t *max   = ptr+pixel.GetIdxMaxHiGainSample();
-        Byte_t *end   = ptr+fRawEvt->GetNumHiGainSamples();
+        Byte_t *end   = ptr+fRunHeader->GetNumSamplesHiGain();
         Byte_t *first = max-fBefore;
         Byte_t *last  = max+fAfter;
@@ -185 +179 @@
             // Area: x9
             ptr = pixel.GetLoGainSamples();
-            end = ptr+fRawEvt->GetNumLoGainSamples();
+            end = ptr+fRunHeader->GetNumSamplesLoGain();
 
             sumb = 0;   // sum background
@@ -213 +207 @@
             }
 
-            end   = ptr+fRawEvt->GetNumLoGainSamples();
+            end   = ptr+fRunHeader->GetNumSamplesLoGain();
             first = max-fBefore;
             last  = max+fAfter;
@@ -254 +248 @@
 
         Float_t s   = sb-b;                // signal
-        //Float_t sqs = sqsb-nsb*b;          // sum sqaures signal
+        //Float_t sqs = sqsb-nsb*b;          // sum squares signal
 
         //Float_t mss  = (float)sqs/nsb;     // mean quare signal
@@ -260 +254 @@
 
         if (sat>1)
-            s*=10; // tgb has measured 9, but Florian said it's 10.
+            s *= 11.3;
 
         Int_t idx = pixel.GetPixelId();

trunk/MagicSoft/Mars/msignal/MSignalCalc.h

@@ -16 +16 @@
     MPedestalCam  *fPedestals;  // Pedestals of all pixels in the camera
     MRawEvtData   *fRawEvt;     // raw event data (time slices)
-    MSignalCam   *fCerPhotEvt; // Cerenkov Photon Event used for calculation
+    MSignalCam    *fCerPhotEvt; // Cerenkov Photon Event used for calculation
     MRawRunHeader *fRunHeader;  // RunHeader information