Changeset 2946 for trunk/MagicSoft

Timestamp:

01/28/04 16:55:40 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• manalysis/MCerPhotAnal2.cc (modified) (4 diffs)
• manalysis/MCerPhotAnal2.h (modified) (2 diffs)
• manalysis/MExtractSignal.cc (modified) (6 diffs)
• mmain/MEventDisplay.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -10 +10 @@
 
 
+
  2004/01/28: Markus Gaug
 
-   * mcalib/MCalibrationCalc.[h,cc]
-   * mcalib/MCalibrationCam.[h,cc]
+   * mcalib/MCalibrationCalc.[h,cc], mcalib/MCalibrationCam.[h,cc]:
      - included flags to indicate if Blind Pixel Method or PIn Diode 
        method was OK. Up to now, program stopped, if one of the two 
        methods was chosen but not able to being executed.
 
-   * manalysis/MArrivalTimeCalc.cc
-   * manalysis/MExtractSignals.cc
-   * manalysis/MGeomApply.cc
+   * manalysis/MArrivalTimeCalc.cc, manalysis/MExtractSignals.cc,
+     manalysis/MGeomApply.cc:
      - put all missing InitSize(npixels) into MGeomApply         
 
 
+
  2004/01/28: Abelardo Moralejo
-
 
    * mcalib/MMcCalibration.cc
@@ -48 +47 @@
        a workaround for a 'bug' in very old camera files, which is not
        necessary anymore.
+
+   * manalysis/MCerPhotAnal2.[h,cc]:
+     - replaced MPedestalCam by MPedPhotCam
+     
+   * manalysis/MExtractSignal.cc:
+     - some small simplification to the signal extraction
+     - removed some obsolete variables
+     - replaced for by while
+     - removed obsolete casts
+     
+   * mmain/MEventDisplay.cc:
+     - gave names to the filters
+     - removed adding MHCamera to fList because it was deleted twice
 
 

trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc

@@ -31 +31 @@
 //
 //  Input Containers:
-//   MRawEvtData, MPedestalCam
+//   MRawEvtData, MPedPhotCam
 //
 //  Output Containers:
@@ -48 +48 @@
 #include "MRawEvtData.h"       // MRawEvtData::GetNumPixels
 #include "MCerPhotEvt.h"
-#include "MPedestalPix.h"
-#include "MPedestalCam.h"
+#include "MPedPhotPix.h"
+#include "MPedPhotCam.h"
 #include "MRawEvtPixelIter.h"
 
@@ -78 +78 @@
 //  - MRawRunHeader
 //  - MRawEvtData
-//  - MPedestalCam
+//  - MPedPhotCam
 //
 // The following output containers are also searched and created if
@@ -116 +116 @@
         }
 
-    fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
+    fPedestals = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam");
     if (runheader && !fPedestals)
         return kFALSE;

trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.h

@@ -16 +16 @@
 
 class MRawEvtData;
-class MPedestalCam;
+class MPedPhotCam;
 class MCerPhotEvt;
 class MRawRunHeader;
@@ -23 +23 @@
 {
 private:
-    MPedestalCam  *fPedestals;  // Pedestals of all pixels in the camera
+    MPedPhotCam   *fPedestals;  // Pedestals of all pixels in the camera
     MRawEvtData   *fRawEvt;     // raw event data (time slices)
     MCerPhotEvt   *fCerPhotEvt; // Cerenkov Photon Event used for calculation

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -102 +102 @@
     if (!fRawEvt)
     {
-      *fLog << err << AddSerialNumber("MRawEvtData") << " not found... aborting." << endl;
+        *fLog << err << AddSerialNumber("MRawEvtData") << " not found... aborting." << endl;
         return kFALSE;
     }
@@ -116 +116 @@
     fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
     if (!fPedestals)
-      {
+    {
         *fLog << err << AddSerialNumber("MPedestalCam") << " not found... aborting" << endl;
         return kFALSE;
-
-      }
+    }
 
     fArrivalTime = (MArrivalTime*)pList->FindCreateObj(AddSerialNumber("MArrivalTime"));
+    if (!fArrivalTime)
+        return kFALSE;
     
     return kTRUE;
@@ -135 +136 @@
 Bool_t MExtractSignal::ReInit(MParList *pList )
 {
-
     MGeomCam *cam = (MGeomCam*)pList->FindObject(AddSerialNumber("MGeomCam"));
     if (!cam)
@@ -143 +143 @@
     }
 
-  return kTRUE;
-}
-
+    return kTRUE;
+}
 
 // --------------------------------------------------------------------------
@@ -154 +153 @@
 Int_t MExtractSignal::Process()
 {
-
     MRawEvtPixelIter pixel(fRawEvt);
     fSignals->Clear();
@@ -165 +163 @@
         UShort_t satLo = 0;
 
-        Byte_t *ptr   = pixel.GetHiGainSamples();
-        Byte_t *first = ptr + fHiGainFirst;
-        Byte_t *last  = ptr + fHiGainFirst + fNumHiGainSamples;
-
-        UInt_t  sumHi   = 0;
-        UInt_t  sumLo   = 0;
+        UInt_t sumHi   = 0;
+        UInt_t sumLo   = 0;
+
+        Byte_t maxhi   = 0;
+        Byte_t midhi   = 0;
+
+        Byte_t *ptr  = pixel.GetHiGainSamples() + fHiGainFirst;
+        Byte_t *last = ptr + fNumHiGainSamples;
+
+        while (ptr<last)
+        {
+            sumHi += *ptr;
+
+            if (*ptr > maxhi)
+            {
+                maxhi = *ptr;
+                midhi = ptr-pixel.GetHiGainSamples();
+            }
+
+            if (*ptr >= fSaturationLimit)
+                satHi++;
+
+            ptr++;
+        }
+
+        ptr  = pixel.GetLoGainSamples() + fLoGainFirst;
+        last = ptr + fNumLoGainSamples;
+
+        Byte_t maxlo  = 0;
+        Byte_t midlo  = 0;
+
+        while (ptr<last)
+        {
+            sumLo += *ptr;
+
+            if (*ptr > maxlo)
+            {
+                maxlo = *ptr;
+                midlo = ptr-pixel.GetLoGainSamples();
+            }
+
+            if (*ptr >= fSaturationLimit)
+                satLo++;
+
+            ptr++;
+        }
+
+        if (satLo)
+            satlo++;
 
         const Int_t pixid = pixel.GetPixelId();
+
         const MPedestalPix  &ped = (*fPedestals)[pixid]; 
         MExtractedSignalPix &pix = (*fSignals)[pixid];
 
-        const Float_t pedes   = ped.GetPedestal();
-        const Float_t pedrms  = ped.GetPedestalRms();
-
-        Byte_t maxhi  = 0;
-        Byte_t midhi  = 0;
-
-        for (ptr=first;ptr<last;ptr++)
-          {
-            
-            if (*ptr > maxhi)
-              {
-                maxhi = *ptr;
-                midhi = ptr-first;
-              }
-
-            sumHi += *ptr;
-            
-            if (*ptr >= fSaturationLimit)
-              satHi++;
-
-          }
-
-        ptr   = pixel.GetLoGainSamples();
-        first = ptr + fLoGainFirst;
-        last  = ptr + fLoGainFirst + fNumLoGainSamples;
-        Byte_t maxlo  = 0;
-        Byte_t midlo  = 0;
-
-        for (ptr=first;ptr<last;ptr++)
-          {
-
-            if (*ptr > maxlo)
-              {
-                maxlo = *ptr;
-                midlo = ptr-first;
-              }
-
-            sumLo += *ptr;
-
-            if (*ptr >= fSaturationLimit)
-                satLo++;
-          }
-
-        if (satLo)
-            satlo++;
-
-        pix.SetExtractedSignal((Float_t)sumHi - pedes*(Float_t)fNumHiGainSamples,
-                               pedrms*fSqrtHiGainSamples,
-                               (Float_t)sumLo - pedes*(Float_t)fNumLoGainSamples,
-                               pedrms*fSqrtLoGainSamples);
+        const Float_t pedes  = ped.GetPedestal();
+        const Float_t pedrms = ped.GetPedestalRms();
+
+        pix.SetExtractedSignal(sumHi - pedes*fNumHiGainSamples, pedrms*fSqrtHiGainSamples,
+                               sumLo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples);
 
         pix.SetGainSaturation(satHi, satHi, satLo);
 
-        if (satHi)
-          fArrivalTime->SetTime(pixid,(Float_t)(midlo+fLoGainFirst));
-        else
-          fArrivalTime->SetTime(pixid,(Float_t)(midhi+fHiGainFirst));
-
-
+        fArrivalTime->SetTime(pixid, satHi?midlo:midhi);
 
       } /* while (pixel.Next()) */

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -204 +204 @@
     MFilter *f1=new MFDataMember("MRawRunHeader.fRunType", '>', 255.5);
     MFilter *f2=new MFDataMember("MRawRunHeader.fRunType", '<', 255.5);
+    f1->SetName("MFMonteCarlo");
+    f2->SetName("MFRealData");
 
     ncalc->SetFilter(f1);
@@ -210 +212 @@
     tlist->AddToList(f1);
     tlist->AddToList(f2);
+    tlist->AddToList(ncalc);
     tlist->AddToList(pcopy);
     tlist->AddToList(pdnsb);
-    tlist->AddToList(ncalc);
     tlist->AddToList(nanal);
     tlist->AddToList(fill1);
@@ -228 +230 @@
     tlist->AddToList(fill8);
 
-
     //
     // Now distribute Display to all tasks
@@ -495 +496 @@
     cam->SetBit(TH1::kNoStats|MHCamera::kNoLegend|kCanDelete);
     cam->Draw("pixelindex");
-    fList->Add(cam);
 
     c1.Modified();
@@ -505 +505 @@
     cam->SetBit(TH1::kNoStats|MHCamera::kNoLegend|kCanDelete);
     cam->Draw("sectorindex");
-    fList->Add(cam);
 
     c2.Modified();