Changeset 9347 for trunk/MagicSoft/Mars/mmain

Timestamp:

02/18/09 12:07:41 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MEventDisplay.cc (modified) (13 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.69 2009-02-12 20:05:06 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.70 2009-02-18 12:06:39 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -92 +92 @@
 #include "MContinue.h"                 // MContinue
 #include "MTriggerPatternDecode.h"     // MTriggerPatternDecode
+#include "MSimSignalCam.h"             // MSimSignalCam
+#include "MSimGeomCam.h"               // MSimGeomCam
 //#include "MMcTriggerLvl2Calc.h"        // MMcTriggerLvl2Calc
 
@@ -112 +114 @@
 #include "MCalibrationChargeCam.h"     // MCalibrationChargeCam
 #include "MMuonSearchPar.h"            // MMuonCalibPar
+#include "MHPhotonEvent.h"             // MHPhotonEvent
 //#include "MMcTriggerLvl2.h"            // MMcTriggerLvl2
 
@@ -180 +183 @@
         return 2;
 
+    if (t->FindBranch("MPhotonEvent."))
+        return 3;
+
     return -2;
 }
@@ -197 +203 @@
     case  1: gLog << all << "Calibrated Data File detected..." << endl; break;
     case  2: gLog << all << "Raw Data File detected..." << endl; break;
+    case  3: gLog << all << "Ceres reflector file detected..." << endl; break;
     case -2: gLog << err << "File type unknown... abort." << endl; return;
     case -1: gLog << err << "Tree " << tname << " not found... abort." << endl; return;
@@ -237 +244 @@
     tlist->AddToList(read);
 
+    MGeomApply *apl = new MGeomApply;
+    tlist->AddToList(apl);
+
+    if (type==3)
+    {
+        MHPhotonEvent *phevt = new MHPhotonEvent;
+        phevt->PermanentReset();
+        plist->AddToList(phevt);
+
+        MFillH *fillh = new MFillH(phevt, "MPhotonEvent");
+        fillh->SetNameTab("Detector");
+        tlist->AddToList(fillh);
+
+        MSimGeomCam *simgeom = new MSimGeomCam;
+        tlist->AddToList(simgeom);
+
+        MSimSignalCam *sim = new MSimSignalCam;
+        tlist->AddToList(sim);
+    }
+
     MContinue *mcevts = new MContinue("MRawEvtData.GetNumPixels==0", "ContEmpty");
     if (type==2)
@@ -247 +274 @@
     contevt->SetInverted();
     tlist->AddToList(contevt);
-
-    MGeomApply *apl = new MGeomApply;
-    tlist->AddToList(apl);
 
     MTriggerPatternDecode *decode = new MTriggerPatternDecode;
@@ -297 +321 @@
     plist->AddToList(evt10);
 
-    MExtractTimeAndChargeDigitalFilter *digf = new MExtractTimeAndChargeDigitalFilter;
-    digf->SetNameWeightsFile("msignal/cosmics_weights46.dat");
-
-    MTaskEnv *taskenv1=new MTaskEnv("ExtractSignal");
-    taskenv1->SetDefault(digf);
-    taskenv1->SetOwner();
-
-    MSignalCalc     *nanal   = new MSignalCalc;
     MFillH          *fill01  = new MFillH(evt01, "MSignalCam", "MFillH01");
     MImgCleanStd    *clean   = new MImgCleanStd;
@@ -317 +333 @@
     MFillH          *fill10  = new MFillH(evt10, "MSignalCam",    "MFillH10");
 
+    MExtractTimeAndChargeDigitalFilter *digf = new MExtractTimeAndChargeDigitalFilter;
+    digf->SetNameWeightsFile("msignal/cosmics_weights46.dat");
+
+    MTaskEnv *taskenv1=new MTaskEnv("ExtractSignal");
+    taskenv1->SetDefault(digf);
+    taskenv1->SetOwner();
+
+    MSignalCalc     *nanal   = new MSignalCalc;
+
     MBadPixelsCalc  *bcalc   = new MBadPixelsCalc;
     MBadPixelsTreat *btreat  = new MBadPixelsTreat;
@@ -379 +404 @@
     if (type==2)
         tlist->AddToList(fill03);
-    tlist->AddToList(fill04);
+    if (type!=3)
+        tlist->AddToList(fill04);
     tlist->AddToList(fill06a);
     tlist->AddToList(fill06b);
@@ -393 +419 @@
         //tlist->AddToList(fill09);
     }
-    if (type==1)
+    if (type==1 || type==3)
     {
         MFillH *fill08 = new MFillH(evt08, "MSignalCam", "MFillH8");
@@ -662 +688 @@
     *fLog << all;
     fLog->Separator(MString::Format("Entry %d", reader->GetNumEntry()+1));
+
     ((MHillas*)     plist->FindObject("MHillas"))->Print(*geom);
     ((MHillasExt*)  plist->FindObject("MHillasExt"))->Print(*geom);
@@ -716 +743 @@
     };
 
+    const Int_t ismc = plist->FindObject("MHPhotonEvent") ? 1 : 0;
 
     for (int i=1; i<7; i++)
     {
-        TCanvas *c = GetCanvas(i);
+        TCanvas *c = GetCanvas(i+ismc);
+        if (!c)
+            continue;
+
         c->cd(1);
 

trunk/MagicSoft/Mars/mmain/Makefile

@@ -24 +24 @@
            -I../mdata -I../msignal -I../mcalib -I../mbadpixels            \
            -I../mpointing -I../mpedestal -I../mmuon -I../mfilter -I../mjobs \
-           -I../mtrigger
+           -I../mtrigger -I../mcorsika -I../msimcamera -I../msim
 
 SRCFILES = MBrowser.cc \