Changeset 3471 for trunk/MagicSoft/Mars/status.cc

Timestamp:

03/11/04 15:25:44 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/status.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/status.cc

@@ -42 +42 @@
 #include "MMcPedestalCopy.h"
 #include "MMcPedestalNSBAdd.h"
-#include "MCerPhotCalc.h"
+//#include "MCerPhotCalc.h"
 #include "MCerPhotAnal2.h"
 //#include "MBlindPixelCalc.h"
@@ -54 +54 @@
 #include "MEvtLoop.h"
 #include "MFDataMember.h"
+#include "MCalibrate.h"
+#include "MExtractSignal.h"
+#include "MMcCalibrationUpdate.h"
 
 #include <TApplication.h>
@@ -196 +199 @@
     MMcPedestalCopy   pcopy;
     MMcPedestalNSBAdd pnsb;
-    MCerPhotCalc      ncalc;
+    //MCerPhotCalc      ncalc;
     MCerPhotAnal2     nanal;
 
     MFDataMember f1("MRawRunHeader.fRunType", '>', 255.5);
     MFDataMember f2("MRawRunHeader.fRunType", '<', 255.5);
-
-    ncalc.SetFilter(&f1);
+    f1.SetName("MFMonteCarlo");
+    f2.SetName("MFRealData");
+
+    MExtractSignal extra;
+    extra.SetRange(5, 9, 5, 9);
+
+    MMcCalibrationUpdate mcupd;
+    mcupd.SetOuterPixelsGainScaling(kFALSE);
+
+    MCalibrate calib;
+
+    // MC
+    extra.SetFilter(&f1);
+    mcupd.SetFilter(&f1);
+    calib.SetFilter(&f1);
     nanal.SetFilter(&f2);
-/*
-    TArrayS blinds(6);
-    blinds[0] =   0;
-    blinds[1] = 195;
-    blinds[2] = 227;
-    blinds[3] = 248;
-    blinds[4] = 271;
-    blinds[5] = 291;
+
+    /*
+     TArrayS blinds(6);
+     blinds[0] =   0;
+     blinds[1] = 195;
+     blinds[2] = 227;
+     blinds[3] = 248;
+     blinds[4] = 271;
+     blinds[5] = 291;
 
      blinds[3] =  51;
@@ -222 +239 @@
      blinds[10]= 291; // 311, 119, 54, 85, 125, 92, 133, 224
 
-    MBlindPixelCalc blind;
-    blind.SetPixelIndices(blinds);
-    //blind.SetUseInterpolation();
-*/
+     MBlindPixelCalc blind;
+     blind.SetPixelIndices(blinds);
+     //blind.SetUseInterpolation();
+     */
+
     // MSigmabarCalc     sgcal;
     MImgCleanStd      clean;
@@ -271 +289 @@
     tlist.AddToList(&pcopy);
     tlist.AddToList(&pnsb);
-    tlist.AddToList(&ncalc);
+
+    tlist.AddToList(&extra);
+    tlist.AddToList(&mcupd);
+    tlist.AddToList(&calib);
+
     tlist.AddToList(&nanal);
     //tlist.AddToList(&blind);