Changeset 3345 for trunk/MagicSoft/Mars/mmain

Timestamp:

02/27/04 20:12:28 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

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

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -58 +58 @@
 // Tasks
 //
-#include "MReadMarsFile.h"       // MReadMarsFile
-#include "MGeomApply.h"          // MGeomApply
-#include "MFDataMember.h"        // MFDataMember
-#include "MMcPedestalCopy.h"     // MMcPedestalCopy
-#include "MMcPedestalNSBAdd.h"   // MMcPedestalNSBAdd
-#include "MCerPhotCalc.h"        // MCerPhotCalc
-#include "MCerPhotAnal2.h"       // MCerPhotAnal2
-#include "MImgCleanStd.h"        // MImgCleanStd
-#include "MHillasCalc.h"         // MHillasCalc
-#include "MHillasSrcCalc.h"      // MHillasSrcCalc
-#include "MBlindPixelCalc.h"     // MBlindPixelCalc
-#include "MArrivalTimeCalc.h"    // MArrivalTimeCalc
-#include "MFillH.h"              // MFillH
+#include "MReadMarsFile.h"        // MReadMarsFile
+#include "MGeomApply.h"           // MGeomApply
+#include "MFDataMember.h"         // MFDataMember
+#include "MMcPedestalCopy.h"      // MMcPedestalCopy
+#include "MMcPedestalNSBAdd.h"    // MMcPedestalNSBAdd
+
+#include "MCerPhotAnal2.h"        // MCerPhotAnal2
+#include "MImgCleanStd.h"         // MImgCleanStd
+#include "MHillasCalc.h"          // MHillasCalc
+#include "MHillasSrcCalc.h"       // MHillasSrcCalc
+#include "MBlindPixelCalc.h"      // MBlindPixelCalc
+#include "MArrivalTimeCalc.h"     // MArrivalTimeCalc
+#include "MFillH.h"               // MFillH
+#include "MExtractSignal.h"       // MExtractsignal
+#include "MMcCalibrationUpdate.h" // MMcCalibrationUpdate
+#include "MCalibrate.h"           // MCalibrate
 
 //
@@ -186 +189 @@
     MMcPedestalCopy   *pcopy = new MMcPedestalCopy;
     MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
-    MCerPhotCalc      *ncalc = new MCerPhotCalc;
     MCerPhotAnal2     *nanal = new MCerPhotAnal2;
     MFillH            *fill1 = new MFillH(evt1, "MCerPhotEvt", "MFillH1");
@@ -207 +209 @@
     f2->SetName("MFRealData");
 
-    ncalc->SetFilter(f1);
+    MExtractSignal* sigextract = new MExtractSignal();
+    sigextract->SetRange(5, 9, 5, 9);
+
+    MMcCalibrationUpdate* mccalibupdate = new MMcCalibrationUpdate;
+    mccalibupdate->SetOuterPixelsGainScaling(kFALSE);
+    MCalibrate* mccalib = new MCalibrate;
+
+    // MC
+    sigextract->SetFilter(f1);
+    mccalibupdate->SetFilter(f1);
+    mccalib->SetFilter(f1);
+
+    // Data
     nanal->SetFilter(f2);
 
@@ -213 +227 @@
     tlist->AddToList(f2);
     tlist->AddToList(pcopy);
-    tlist->AddToList(ncalc);
     tlist->AddToList(pdnsb);
+
+    tlist->AddToList(sigextract);
+    tlist->AddToList(mccalibupdate);
+    tlist->AddToList(mccalib);
+
     tlist->AddToList(nanal);
+
     tlist->AddToList(fill1);
     tlist->AddToList(clean);

trunk/MagicSoft/Mars/mmain/Makefile

@@ -25 +25 @@
            -I../mgui -I../mgeom -I../mhbase -I../mhist -I../mmontecarlo   \
            -I../mfileio -I../mimage -I../mhistmc -I../mgbase -I../mfbase \
-           -I../mdata -I../msignal
+           -I../mdata -I../msignal -I../mcalib
 
 #------------------------------------------------------------------------------