Changeset 8357 for trunk

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mpedestal/MExtractPedestal.cc (modified) (3 diffs)
• mpedestal/MExtractPedestal.h (modified) (3 diffs)
• mpedestal/MPedCalcFromLoGain.h (modified) (1 diff)
• mpedestal/MPedCalcPedRun.h (modified) (1 diff)
• msignal/MExtractBlindPixel.cc (modified) (1 diff)
• msignal/MSignalCalc.cc (modified) (7 diffs)
• msignal/MSignalCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.26 2007-02-04 15:49:08 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.27 2007-03-03 22:27:50 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -311 +311 @@
 }
 
+Bool_t MExtractPedestal::SetRangeFromExtractor(const MExtractor &ext, Bool_t logain)
+{
+    const Bool_t haslogains = ext.GetLoGainFirst()!=0 && ext.GetLoGainLast()!=0;
+
+    Bool_t rc1 = kTRUE;
+    if (!haslogains)
+    {
+        // We assume that in case without lo-gains we
+        // deal with pedestal events only
+        rc1 = SetCheckRange(ext.GetHiGainFirst(), ext.GetHiGainLast());
+    }
+
+    const Int_t f = logain && haslogains ? ext.GetLoGainFirst() : ext.GetHiGainFirst();
+    const Int_t l = logain && haslogains ? ext.GetLoGainLast()  : ext.GetHiGainLast();
+
+    const Int_t w = (l-f+1);
+
+    // Setup to use the hi-gain extraction window in the lo-gain
+    // range (the start of the lo-gain range is added automatically
+    // by MPedCalcFromLoGain)
+    const Bool_t rc2 = SetExtractWindow(f, w);
+
+    return rc1 && rc2;
+}
 
 // --------------------------------------------------------------------------
@@ -556 +580 @@
             return kFALSE;
 
+        SetRangeFromExtractor(*fExtractor);
+        /*
         // If an extractor is set determin the window size automatically!
         fExtractWinFirst = fExtractor->GetHiGainFirst();
         fExtractWinLast  = fExtractor->GetHiGainLast();
 
+        if (!fExtractor->HasLoGain())
+        {
+            fCheckWinFirst=fExtractWinFirst;
+            fCheckWinLast =fExtractWinLast;
+        }*/
         // fSignal->GetNumSamples() not yet initialized!!!
         const UInt_t num = fRunHeader->GetNumSamplesHiGain()+fRunHeader->GetNumSamplesLoGain();

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h

@@ -15 +15 @@
 
 class MGeomCam;
+class MExtractor;
 class MPedestalCam;
 class MRawEvtData;
@@ -103 +104 @@
   void CheckExtractionWindow(UInt_t offset=0);
 
+  Bool_t SetRangeFromExtractor(const MExtractor &ext, Bool_t logain);
+
 public:
   MExtractPedestal(const char *name=NULL, const char *title=NULL);
@@ -112 +115 @@
   Bool_t SetExtractWindow(UShort_t first, UShort_t size);
   Bool_t SetCheckRange(UShort_t checkfirst=fgCheckWinFirst, UShort_t checklast=fgCheckWinLast);
+
+  virtual Bool_t SetRangeFromExtractor(const MExtractor &ext) = 0;
 
   void SetMaxSignalVar(UShort_t maxvar=40)  { fMaxSignalVar = maxvar;    }

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.h

@@ -63 +63 @@
     void SetPedestalUpdate(Bool_t b=kTRUE) { fPedestalUpdate      = b; }
 
+    Bool_t SetRangeFromExtractor(const MExtractor &ext)
+    {
+        return MExtractPedestal::SetRangeFromExtractor(ext, kTRUE);
+    }
+
     void Print(Option_t *o="") const;
 

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.h

@@ -38 +38 @@
     void Print(Option_t *o="") const;
     void Reset();
+
+    Bool_t SetRangeFromExtractor(const MExtractor &ext)
+    {
+        return MExtractPedestal::SetRangeFromExtractor(ext, kFALSE);
+    }
     
     Int_t Finalize();

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