Changeset 3085 for trunk/MagicSoft

Timestamp:

02/10/04 23:03:58 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mfilter/MFCosmics.cc (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mfilter/MFCosmics.cc

@@ -211 +211 @@
   *fLog << " (with fMaxEmptyPixels = " << fMaxEmptyPixels << ")" << endl;
 
-  *fLog << " " << fCut[0] << " (" << (int)(fCut[0]*100/GetNumExecutions()) ;
+  *fLog << " " << setw(7) << fCut[0] << " (" << setw(3) ;
+  *fLog << (int)(fCut[0]*100/GetNumExecutions()) ;
   *fLog << "%) Evts survived the cosmics rejection!" << endl;
   *fLog << endl;

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -55 +55 @@
 #include "MExtractSignal2.h"
 #include "MCalibrationCalc.h"
+#include "MFCosmics.h"
+#include "MContinue.h"
 
 #include "MJCalibration.h"
@@ -490 +492 @@
     MCalibrationCalc calcalc;
 
+    // 
+    // Apply a filter against cosmics
+    // (will have to be needed in the future
+    // when the calibration hardware-trigger is working)
+    // 
+    MFCosmics            cosmics;
+    MContinue            cont(&cosmics);
+
     //
     // As long, as we don't have digital modules, 
@@ -501 +511 @@
     tlist.AddToList(&merge);
     tlist.AddToList(&extract);
+    tlist.AddToList(&cont);
     tlist.AddToList(&calcalc);