Changeset 8406 for trunk/MagicSoft/Mars/mjobs

Timestamp:

04/15/07 10:38:08 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (4 diffs)
• MJCalibrateSignal.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -112 +112 @@
 #include "MWriteRootFile.h"
 
-/*
- #include "MFEvtNumber.h"
- #include "MMoviePrepare.h"
- #include "MMovieWrite.h"
- #include "MImgCleanStd.h"
- */
+#include "MFEvtNumber.h"
+#include "MMoviePrepare.h"
+#include "MMovieWrite.h"
+#include "MImgCleanStd.h"
 
 ClassImp(MJCalibrateSignal);
@@ -134 +132 @@
 //
 MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title)
-    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE)
+    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE), fIsMovieMode(kFALSE)
 {
     fName  = name  ? name  : "MJCalibrateSignal";
@@ -224 +222 @@
     SetInterlaced(GetEnv("Interlaced", fIsInterlaced));
     SetRelTimesUpdate(GetEnv("RelTimesUpdate", fIsRelTimesUpdate));
+    SetMovieMode(GetEnv("MovieMode", fIsMovieMode));
 
     return MJCalib::CheckEnvLocal();
@@ -802 +801 @@
 
      tlist2.AddToList(&fillP);
-
-     // --- Start: Code for encoding movies ---
-
-     MMoviePrepare movprep;
-     MMovieWrite   movwrite;
-     movprep.SetRangeFromExtractor(*extractor1);
-
-     MFDataPhrase movfilt("MMovieData.fMax>150");
-
-     MImgCleanStd movclean(8.5, 4.0);
-     movclean.SetMethod(MImgCleanStd::kAbsolute);
-
-     //movprep.SetFilter(&evtnum);
-     movclean.SetFilter(&movfilt);
-     movwrite.SetFilter(&movfilt);
-
-     MTaskList tlistmov;
-     tlistmov.AddToList(&movprep);
-     tlistmov.AddToList(&movfilt);
-     tlistmov.AddToList(&movclean);
-     tlistmov.AddToList(&movwrite);
-
-     MFEvtNumber evtnum;
-     //evtnum.SetFileName("ganymed00000001.root");
-     tlistmov.SetFilter(&evtnum);
-
-     //tlist2.AddToList(&evtnum);
-     //tlist2.AddToList(&tlistmov);
-
-     // --- End: Code for encoding movies ---
      */
+
+    // ----- Start: Code for encoding movies -----
+
+    MMoviePrepare movprep;
+    MMovieWrite   movwrite;
+    movprep.SetRangeFromExtractor(*extractor1);
+
+    //MFDataPhrase movfilt("MMovieData.fMax>150");
+    MFDataPhrase movfilt("MMovieData.fMax>5*MMovieData.fMedianPedestalRms", "MovieFilter");
+
+    MImgCleanStd movclean(8.5, 4.0);
+    movclean.SetMethod(MImgCleanStd::kAbsolute);
+
+    //movprep.SetFilter(&evtnum);
+    movclean.SetFilter(&movfilt);
+    movwrite.SetFilter(&movfilt);
+
+    MTaskList tlistmov;
+    tlistmov.AddToList(&movprep);
+    tlistmov.AddToList(&movfilt);
+    tlistmov.AddToList(&movclean);
+    tlistmov.AddToList(&movwrite);
+
+    MFEvtNumber evtnum;
+    //evtnum.SetSelector("ThetaSquared.fVal<0.04");
+    //evtnum.SetFileName("ganymed00000001.root");
+    tlistmov.SetFilter(&evtnum);
+
+    if (fIsMovieMode)
+    {
+        tlist2.AddToList(&evtnum);
+        tlist2.AddToList(&tlistmov);
+    }
+
+    // ----- End: Code for encoding movies -----
 
     tlist2.AddToList(&fillflorian);

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h

@@ -24 +24 @@
     Bool_t fIsInterlaced;               // Distinguish interlaced from other calibration
     Bool_t fIsRelTimesUpdate;           // Choose to update relative times from interlaced
-    
+    Bool_t fIsMovieMode;                // Choose to encode a movie
+
     Bool_t CheckEnvLocal();
 
@@ -37 +38 @@
     
 public:
-
     MJCalibrateSignal(const char *name=NULL, const char *title=NULL);
     ~MJCalibrateSignal();
@@ -43 +43 @@
     Bool_t Process(MPedestalCam &camab, MPedestalCam &cam1, MPedestalCam &cam2);
 
-    void SetInterlaced     ( const Bool_t b=kTRUE )  { fIsInterlaced      = b; }
-    void SetRelTimesUpdate ( const Bool_t b=kTRUE )  { fIsRelTimesUpdate  = b; }
+    void SetInterlaced    (const Bool_t b=kTRUE) { fIsInterlaced     = b; }
+    void SetRelTimesUpdate(const Bool_t b=kTRUE) { fIsRelTimesUpdate = b; }
+    void SetMovieMode     (const Bool_t b=kTRUE) { fIsMovieMode      = b; }
 
     void SetExtractor(const MExtractor *ext=NULL);