Changeset 7134 for trunk/MagicSoft/Mars/mmain

Timestamp:

06/03/05 20:15:28 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

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

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -83 +83 @@
 #include "MMcCalibrationUpdate.h" // MMcCalibrationUpdate
 #include "MCalibrateData.h"       // MCalibrateData
+#include "MMuonSearchParCalc.h"   // MMuonSearchParCalc
+#include "MMuonCalibParCalc.h"    // MMuonCalibParCalc
 //#include "MMcTriggerLvl2Calc.h"   // MMcTriggerLvl2Calc
 
@@ -100 +102 @@
 #include "MPedPhotCam.h"           // MPedPhotCam
 #include "MCalibrationChargeCam.h" // MCalibrationChargeCam
+#include "MMuonSearchPar.h"        // MMuonCalibPar
 //#include "MMcTriggerLvl2.h"        // MMcTriggerLvl2
 
@@ -212 +215 @@
     //plist->AddToList(atime);
 
-    MHEvent *evt01 = new MHEvent(MHEvent::kEvtSignalRaw);
-    MHEvent *evt02 = new MHEvent(MHEvent::kEvtSignalRaw);
+    MHEvent *evt01 = new MHEvent(MHEvent::kEvtSignalDensity);
+    MHEvent *evt02 = new MHEvent(MHEvent::kEvtSignalDensity);
     MHEvent *evt03 = new MHEvent(type==1?MHEvent::kEvtPedPhot:MHEvent::kEvtPedestal);
     MHEvent *evt04 = new MHEvent(type==1?MHEvent::kEvtPedPhotRMS:MHEvent::kEvtPedestalRMS);
@@ -247 +250 @@
 
     MExtractTimeAndChargeDigitalFilter *digf = new MExtractTimeAndChargeDigitalFilter;
-    digf->ReadWeightsFile("msignal/MC_weights.dat");
+    digf->SetNameWeightsFile("msignal/cosmics_weights46.dat");
 
     MTaskEnv *taskenv1=new MTaskEnv("ExtractSignal");
@@ -253 +256 @@
     taskenv1->SetOwner();
 
-    MSignalCalc        *nanal  = new MSignalCalc;
-    MFillH             *fill01 = new MFillH(evt01, "MSignalCam", "MFillH01");
-    MImgCleanStd       *clean  = new MImgCleanStd;
-    MFillH             *fill02 = new MFillH(evt02, "MSignalCam", "MFillH02");
-    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");
-    MHillasCalc        *hcalc  = new MHillasCalc;
+    MSignalCalc     *nanal   = new MSignalCalc;
+    MFillH          *fill01  = new MFillH(evt01, "MSignalCam", "MFillH01");
+    MImgCleanStd    *clean   = new MImgCleanStd;
+    MFillH          *fill02  = new MFillH(evt02, "MSignalCam", "MFillH02");
+    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");
+    MHillasCalc     *hcalc   = new MHillasCalc;
     //MMcTriggerLvl2Calc *trcal  = new MMcTriggerLvl2Calc;
     //MFillH             *fill09 = new MFillH(evt09, "MMcTriggerLvl2", "MFillH09");
-    MFillH             *fill10 = new MFillH(evt10, "MSignalCam",    "MFillH10");
-
-    MBadPixelsCalc     *bcalc  = new MBadPixelsCalc;
-    MBadPixelsTreat    *btreat = new MBadPixelsTreat;
+    MFillH          *fill10  = new MFillH(evt10, "MSignalCam",    "MFillH10");
+
+    MBadPixelsCalc  *bcalc   = new MBadPixelsCalc;
+    MBadPixelsTreat *btreat  = new MBadPixelsTreat;
     btreat->SetProcessTimes(kFALSE);
     if (type==1)
@@ -336 +339 @@
     }
     tlist->AddToList(hcalc);
+    // --------------------------------------------------
+    MMuonSearchParCalc *muscalc = new MMuonSearchParCalc;
+    MMuonCalibParCalc  *mcalc   = new MMuonCalibParCalc;
+    MFillH *fillmuon = new MFillH("MHSingleMuon", "", "FillMuon");
+    tlist->AddToList(muscalc);
+    tlist->AddToList(fillmuon);
+    tlist->AddToList(mcalc);
+    // --------------------------------------------------
 
     //
@@ -542 +553 @@
     plist->FindObject("MImagePar")->Print();
     ((MNewImagePar*)plist->FindObject("MNewImagePar"))->Print(*geom);
+    plist->FindObject("MMuonCalibPar")->Print();
+    ((MMuonSearchPar*)plist->FindObject("MMuonSearchPar"))->Print(*geom);
 
     //
@@ -589 +602 @@
     TObject *hillas1 = plist->FindObject("MHillas");
     TObject *hillas2 = plist->FindObject("MHillasSrc");
+    TObject *hmuon   = plist->FindObject("MMuonSearchPar");
     for (int i=1; i<7;i++)
     {
         TCanvas *c = GetCanvas(i);
         c->GetPad(1)->cd(1);
+        hmuon->Draw();
         hillas1->Draw();
         hillas2->Draw();

trunk/MagicSoft/Mars/mmain/Makefile

@@ -23 +23 @@
            -I../mfileio -I../mimage -I../mhistmc -I../mgbase -I../mfbase  \
            -I../mdata -I../msignal -I../mcalib -I../mbadpixels            \
-           -I../mpointing -I../mpedestal
+           -I../mpointing -I../mpedestal -I../mmuon
 
 SRCFILES = MBrowser.cc \