Changeset 3810 for trunk/MagicSoft/Mars

Timestamp:

04/22/04 21:49:38 (21 years ago)

Author:

reyes

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (6 diffs)
• mjobs/MJPedestal.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -121 +121 @@
      - added MRawFileRead for option SetDataCheck()
 
+   * mjobs/MJPedestal.cc
+     - added MRawFileRead for option SetDataCheck()
 
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -17 +17 @@
 !
 !   Author(s): Thomas Bretz, 1/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
+!              Markus Gaug ,04/2004 <mailto:markus@ifae.es>
 !
 !   Copyright: MAGIC Software Development, 2000-2004
@@ -53 +54 @@
 
 #include "MReadMarsFile.h"
+#include "MRawFileRead.h"
 #include "MGeomApply.h"
 #include "MBadPixelsMerge.h"
@@ -61 +63 @@
 using namespace std;
 
-MJPedestal::MJPedestal(const char *name, const char *title) : fRuns(0)
+MJPedestal::MJPedestal(const char *name, const char *title) 
+    : fRuns(0), fDataCheck(kFALSE)
+
 {
     fName  = name  ? name  : "MJPedestal";
@@ -226 +230 @@
 void MJPedestal::DisplayResult(MParList &plist)
 {
+
     if (!fDisplay)
         return;
@@ -333 +338 @@
     *fLog << endl;
 
+    MParList plist;
+    MTaskList tlist;
+    plist.AddToList(&tlist);
+
     MReadMarsFile read("Events");
-    read.DisableAutoScheme();
-    static_cast<MRead&>(read).AddFiles(*fRuns);
-
+    MRawFileRead rawread("");
+
+    if (fDataCheck)
+    {
+//      rawread.AddFiles(*fRuns);
+        tlist.AddToList(&rawread);
+    }
+    else
+    {
+        read.DisableAutoScheme();
+        static_cast<MRead&>(read).AddFiles(*fRuns);
+        tlist.AddToList(&read);
+    }
     // Enable logging to file
     //*fLog.SetOutputFile(lname, kTRUE);
 
     // Setup Tasklist
-    MParList plist;
     plist.AddToList(&fPedestalCam);
     plist.AddToList(&fBadPixels);
-
-    MTaskList tlist;
-    plist.AddToList(&tlist);
 
     MGeomApply      geomapl;
@@ -353 +368 @@
     MPedCalcPedRun  pedcalc;
 
-    tlist.AddToList(&read);
     tlist.AddToList(&geomapl);
     //    tlist.AddToList(&merge);

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -25 +25 @@
     MBadPixelsCam fBadPixels;
 
+    Bool_t fDataCheck;                              // Flag if the data check is run on raw data
+
     Bool_t ReadPedestalCam();
     Bool_t WriteResult();
@@ -37 +39 @@
     void SetOutputPath(const char *path=".");
     void SetInput(MRunIter *iter) { fRuns=iter; }
+
+    // Data Check
+    void SetDataCheck(const Bool_t b=kTRUE) { fDataCheck = b; }
 
     TString GetOutputFile() const;