Changeset 6569 for trunk/MagicSoft/Mars/mmain

Timestamp:

02/17/05 17:09:00 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MCameraDisplay.cc (modified) (1 diff)
• MEventDisplay.cc (modified) (11 diffs)
• MEventDisplay.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mmain/MCameraDisplay.cc

@@ -90 +90 @@
         {
         case kButDisplay:
-            new MEventDisplay(fInputFile, "ped.root", "cal.root");
+            new MEventDisplay(fInputFile);
             return kTRUE;
         }

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -70 +70 @@
 #include "MMcPedestalNSBAdd.h"    // MMcPedestalNSBAdd
 
-#include "MCerPhotAnal2.h"        // MCerPhotAnal2
+#include "MCerPhotAnal2.h"        // MPedestalCalc
+#include "MTaskEnv.h"             // MTaskEnv
+#include "MExtractTimeAndChargeDigitalFilter.h"
 #include "MImgCleanStd.h"         // MImgCleanStd
 #include "MHillasCalc.h"          // MHillasCalc
-//#include "MHillasSrcCalc.h"       // MHillasSrcCalc
-//#include "MBlindPixelCalc.h"      // MBlindPixelCalc
-#include "MArrivalTimeCalc.h"     // MArrivalTimeCalc
+#include "MCalibrationRelTimeCalc.h" // MHillasSrcCalc
+#include "MPrint.h"               // 
+#include "MBadPixelsCalc.h"       // MBadPixelsCalc
+#include "MBadPixelsTreat.h"      // MBadPixelsTreat
 #include "MFillH.h"               // MFillH
 #include "MExtractSignal.h"       // MExtractsignal
@@ -107 +110 @@
 //  Constructor.
 //
-MEventDisplay::MEventDisplay(const char *fname, const char *pname, const char *cname) : MStatusDisplay(), fEvtLoop(0)
+MEventDisplay::MEventDisplay(const char *fname) : MStatusDisplay(), fEvtLoop(0)
 {
     //
     // Setup Task list for hillas calculation
     //
-    SetupTaskList("Events", fname, pname, cname);
+    SetupTaskList("Events", fname);
 
     //
@@ -170 +173 @@
 //  preprocess tasks and read in first event (process)
 //
-void MEventDisplay::SetupTaskList(const char *tname, const char *fname,
-                                  const char *pname, const char *cname)
-{
-    MCalibrationChargeCam *ccam=0;
-    MPedPhotCam           *pcam=0;
+void MEventDisplay::SetupTaskList(const char *tname, const char *fname)
+{
+//    MCalibrationChargeCam *ccam=0;
+//    MPedPhotCam           *pcam=0;
 
     MBadPixelsCam *badpix = new MBadPixelsCam;
@@ -187 +189 @@
     }
 
-    if (type==2)
-    {
-        TFile file(pname, "READ");
-        if (!file.IsZombie())
-            pcam = new MPedPhotCam;
-        if (pcam)
-        {
-            if (pcam->Read()<=0)
-            {
-                delete pcam;
-                pcam = NULL;
-            }
-
-            if (file.FindKey("MBadPixelsCam"))
-            {
-                MBadPixelsCam bad;
-                if (bad.Read()>0)
-                    badpix->Merge(bad);
-            }
-        }
-        file.Close();
-        file.Open(cname, "READ");
-        if (!file.IsZombie())
-            ccam = new MCalibrationChargeCam;
-        if (ccam)
-        {
-            if (ccam->Read()<=0)
-            {
-                delete ccam;
-                ccam = NULL;
-            }
-
-            if (file.FindKey("MBadPixelsCam"))
-            {
-                MBadPixelsCam bad;
-                if (bad.Read()>0)
-                    badpix->Merge(bad);
-            }
-        }
-        file.Close();
-    }
-
     //
     // Setup an empty job, with a reader task only.
@@ -248 +208 @@
     plist->AddToList(tlist);
     plist->AddToList(badpix);
-    if (pcam)
-        plist->AddToList(pcam);
-    if (ccam)
-        plist->AddToList(ccam);
 
     //MArrivalTime *atime = new MArrivalTime;
@@ -290 +246 @@
     plist->AddToList(evt10);
 
+    MExtractTimeAndChargeDigitalFilter *digf = new MExtractTimeAndChargeDigitalFilter;
+    digf->ReadWeightsFile("msignal/MC_weights.dat");
+
+    MTaskEnv *taskenv1=new MTaskEnv("ExtractSignal");
+    taskenv1->SetDefault(digf);
+    taskenv1->SetOwner();
+
     MCerPhotAnal2      *nanal  = new MCerPhotAnal2;
     MFillH             *fill01 = new MFillH(evt01, "MCerPhotEvt", "MFillH01");
     MImgCleanStd       *clean  = new MImgCleanStd;
     MFillH             *fill02 = new MFillH(evt02, "MCerPhotEvt", "MFillH02");
-    MFillH             *fill03 = new MFillH(evt03, type==1?"MPedPhotFundamental":"MPedPhotCam", "MFillH03");
-    MFillH             *fill04 = new MFillH(evt04, type==1?"MPedPhotFromExtractorRndm":"MPedPhotCam", "MFillH04");
+    MFillH             *fill03 = new MFillH(evt03, type==1?"MPedPhotFundamental":"MPedestalCam",       "MFillH03");
+    MFillH             *fill04 = new MFillH(evt04, type==1?"MPedPhotFromExtractorRndm":"MPedestalCam", "MFillH04");
     MFillH             *fill06a= new MFillH(evt06a, "MCameraData", "MFillH06a");
     MFillH             *fill06b= new MFillH(evt06b, "MCameraData", "MFillH06b");
-    //MBlindPixelCalc   *blind = new MBlindPixelCalc;
     MHillasCalc        *hcalc  = new MHillasCalc;
     MMcTriggerLvl2Calc *trcal  = new MMcTriggerLvl2Calc;
@@ -304 +266 @@
     MFillH             *fill10 = new MFillH(evt10, "MCerPhotEvt",    "MFillH10");
 
+    MBadPixelsCalc     *bcalc  = new MBadPixelsCalc;
+    MBadPixelsTreat    *btreat = new MBadPixelsTreat;
+    btreat->SetProcessTimes(kFALSE);
     if (type==1)
+    {
+        bcalc->SetNamePedPhotCam("MPedPhotFromExtractor");
+        btreat->AddNamePedPhotCam("MPedPhotFromExtractorRndm");
         clean->SetNamePedPhotCam("MPedPhotFromExtractorRndm");
+    }
 
     // If no pedestal or no calibration file is availble
     if (type==2)
     {
-        if (!pcam || !ccam)
-        {
-            MFilter *f1=new MFDataMember("MRawRunHeader.fRunType", '>', 255.5);
-            MFilter *f2=new MFDataMember("MRawRunHeader.fRunType", '<', 255.5);
-            f1->SetName("MFMonteCarlo");
-            f2->SetName("MFRealData");
-
-            MMcPedestalCopy   *pcopy = new MMcPedestalCopy;
-            MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
-
-            MExtractSignal* extra = new MExtractSignal();
-            extra->SetRange(0, 14, 0, 14);
-            extra->SetSaturationLimit(240);
-
-            MMcCalibrationUpdate* mcupd = new MMcCalibrationUpdate;
-            mcupd->SetOuterPixelsGainScaling(kFALSE);
-
-            MCalibrateData* mccal = new MCalibrateData;
-            mccal->SetCalibrationMode(MCalibrateData::kFfactor);
-
-            // MC
-            extra->SetFilter(f1);
-            mcupd->SetFilter(f1);
-            mccal->SetFilter(f1);
-            trcal->SetFilter(f1);
-            //fill09->SetFilter(f1);
-
-            // Data
-            nanal->SetFilter(f2);
-
-            // TaskList
-            tlist->AddToList(f1);
-            tlist->AddToList(f2);
-            tlist->AddToList(pcopy);
-            tlist->AddToList(pdnsb);
-
-            tlist->AddToList(extra);
-            tlist->AddToList(mcupd);
-            tlist->AddToList(mccal);
-
-
-            tlist->AddToList(nanal);
-        }
-        else
-        {
-            MCalibrateData* calib = new MCalibrateData;
-            tlist->AddToList(calib);
-        }
+        MFilter *f1=new MFDataMember("MRawRunHeader.fRunType", '>', 255.5);
+        f1->SetName("MFMonteCarlo");
+
+        MMcPedestalCopy   *pcopy = new MMcPedestalCopy;
+        MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
+
+        MMcCalibrationUpdate* mcupd = new MMcCalibrationUpdate;
+        mcupd->SetOuterPixelsGainScaling(kFALSE);
+
+        MCalibrateData* calib = new MCalibrateData;
+        calib->SetCalibrationMode(MCalibrateData::kFlatCharge);
+        calib->SetPedestalFlag(MCalibrateData::kEvent);
+
+        //MCalibrationRelTimeCalc *tcalc = new MCalibrationRelTimeCalc;
+
+        // MC
+        mcupd->SetFilter(f1);
+        trcal->SetFilter(f1);
+
+        // TaskList
+        tlist->AddToList(f1);
+        tlist->AddToList(pcopy);
+        tlist->AddToList(pdnsb);
+
+        tlist->AddToList(nanal);    // Calculated MPedPhotCam
+        tlist->AddToList(taskenv1); // Calculates MExtractedSignalCam, MArrivalTimeCam
+        tlist->AddToList(mcupd);
+        tlist->AddToList(calib);    // MExtractedSignalCam --> MCerPhotEvt
+
+        tlist->AddToList(bcalc);    // Produce MBadPixelsCam
+        tlist->AddToList(btreat);   // Treat MBadPixelsCam
     }
 
@@ -367 +319 @@
     tlist->AddToList(fill06a);
     tlist->AddToList(fill06b);
-    //tlist->AddToList(blind);
     tlist->AddToList(fill10);
-    tlist->AddToList(hcalc);
-    if ((!pcam || !ccam) && type==2)
-    {
-        MArrivalTimeCalc  *tcalc = new MArrivalTimeCalc;
-        MFillH            *fill07 = new MFillH(evt07, "MRawEvtData",     "MFillH7");
-        MFillH            *fill08 = new MFillH(evt08, "MArrivalTimeCam", "MFillH8");
-        tlist->AddToList(tcalc);
+    if (type==2)
+    {
+        MFillH *fill07 = new MFillH(evt07, "MRawEvtData",     "MFillH7");
+        MFillH *fill08 = new MFillH(evt08, "MArrivalTimeCam", "MFillH8");
         tlist->AddToList(fill07);
         tlist->AddToList(fill08);
@@ -387 +335 @@
         tlist->AddToList(fill08);
     }
+    tlist->AddToList(hcalc);
 
     //
@@ -570 +519 @@
         }
 
-        if (!tlist->Process())
+        const Int_t rc = tlist->Process();
+        if (rc==kFALSE || rc==kERROR)
             return;
 
@@ -609 +559 @@
 void MEventDisplay::ReadFirstEvent()
 {
-    if (!fEvtLoop->PreProcess())
+    const Int_t rc = fEvtLoop->PreProcess();
+    if (rc==kFALSE || rc==kERROR)
         return;
 

trunk/MagicSoft/Mars/mmain/MEventDisplay.h

@@ -38 +38 @@
 
     void UpdateDisplay();
-    void SetupTaskList(const char *tname, const char *fname,
-                       const char *pname=0, const char *cname=0);
+    void SetupTaskList(const char *tname, const char *fname);
 
     void ReadFirstEvent();
@@ -49 +48 @@
 
 public:
-    MEventDisplay(const char *fname, const char *pname=0, const char *cname=0);
+    MEventDisplay(const char *fname);
     ~MEventDisplay();