Changeset 8439 for trunk/MagicSoft

Timestamp:

04/24/07 13:24:05 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto_Dec04Jan05.rc (modified) (2 diffs)
• callisto_MarApr05.rc (modified) (2 diffs)
• callisto_mux.rc (modified) (2 diffs)
• mjobs/MJCalib.h (modified) (4 diffs)
• mjobs/MJPedestal.cc (modified) (8 diffs)
• mmovie/MMovieWrite.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

@@ -469 +469 @@
 #MMoviePrepare.FirstSlice: 0
 #MMoviePrepare.LastSlice:  15
-#MMoviePrepare.TargetLength: 5
-#MMoviePrepare.NumEvents: 500
-#MMoviePrepare.Threshold: 3
-#MMoviePrepare.Filename: filename.mpg
 #MovieFilter.Condition: MMovieData.fMax>5*MMovieData.fMedianPedestalRms
 #MImgCleanStd.CleanLevel1: 8.0
@@ -478 +474 @@
 #MFEvtNumber.FileName: ganymed00001218.root
 #MFEvtNumber.Selector: ThetaSquared.fVal<0.04 && DataType.fVal>0.5
+#MMovieWrite.TargetLength: 5
+#MMovieWrite.NumEvents: 500
+#MMovieWrite.Threshold: 3
+#MMovieWrite.FileName: filename.mpg
 
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/callisto_MarApr05.rc

@@ -465 +465 @@
 #MMoviePrepare.FirstSlice: 0
 #MMoviePrepare.LastSlice:  15
-#MMoviePrepare.TargetLength: 5
-#MMoviePrepare.NumEvents: 500
-#MMoviePrepare.Threshold: 3
-#MMoviePrepare.Filename: filename.mpg
 #MovieFilter.Condition: MMovieData.fMax>5*MMovieData.fMedianPedestalRms
 #MImgCleanStd.CleanLevel1: 8.0
@@ -474 +470 @@
 #MFEvtNumber.FileName: ganymed00001218.root
 #MFEvtNumber.Selector: ThetaSquared.fVal<0.04 && DataType.fVal>0.5
+#MMovieWrite.TargetLength: 5
+#MMovieWrite.NumEvents: 500
+#MMovieWrite.Threshold: 3
+#MMovieWrite.FileName: filename.mpg
 
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/callisto_mux.rc

@@ -470 +470 @@
 #MMoviePrepare.FirstSlice: 10
 #MMoviePrepare.LastSlice:  50
-#MMoviePrepare.TargetLength: 5
-#MMoviePrepare.NumEvents: 500
-#MMoviePrepare.Threshold: 3
-#MMoviePrepare.Filename: filename.mpg
 #MovieFilter.Condition: MMovieData.fMax>5*MMovieData.fMedianPedestalRms
 #MImgCleanStd.CleanLevel1: 8.0
@@ -479 +475 @@
 #MFEvtNumber.FileName: ganymed00001218.root
 #MFEvtNumber.Selector: ThetaSquared.fVal<0.04 && DataType.fVal>0.5
+#MMovieWrite.TargetLength: 5
+#MMovieWrite.NumEvents: 500
+#MMovieWrite.Threshold: 3
+#MMovieWrite.FileName: filename.mpg
 
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/mjobs/MJCalib.h

@@ -11 +11 @@
 {
 public:
-    enum DataType_t
-    {
-        kIsUseRootData,
-        kIsUseRawData,
-        kIsUseMC
-    };
 
 private:
 
     static const Int_t fgCheckedPixId;  //! Default for fCheckedPixId
-
-    Byte_t fDataFlag;                   // Bit-field to store the data type
 
     enum  Storage_t                     // Possible devices for calibration
@@ -29 +21 @@
         kHistsStorage
       };                                // Possible flags for the storage of results
-    
+
     Byte_t fStorage;                    // Bit-field for chosen storage type
 
@@ -46 +38 @@
 
     Bool_t fIsPulsePosCheck;            // Check pulse position?
-    //Bool_t fIsHiLoCalibration;          // Choose to calibrate the high-gain vs. low-gains
-    
+
     Bool_t CheckEnvLocal();
-    Byte_t GetDataFlag() { return fDataFlag; }
 
     Bool_t IsNoStorage    () const { return TESTBIT(fStorage,kNoStorage);    }
     Bool_t IsHistsStorage () const { return TESTBIT(fStorage,kHistsStorage); }
-    
+
 public:
-
     MJCalib();
-
-    Bool_t IsUseRawData()  const { return fDataFlag==kIsUseRawData;  }
-    Bool_t IsUseRootData() const { return fDataFlag==kIsUseRootData; }
-    Bool_t IsUseMC()       const { return fDataFlag==kIsUseMC;       }
 
     Bool_t IsUseBlindPixel() const { return TESTBIT(fDevices,kUseBlindPixel); }
     Bool_t IsUsePINDiode  () const { return TESTBIT(fDevices,kUsePINDiode);   }
 
-    void SetUseRawData () { fDataFlag=kIsUseRawData;  }
-    void SetUseRootData() { fDataFlag=kIsUseRootData; }
-    void SetUseMC      () { fDataFlag=kIsUseMC;       }
-
-    void SetDataType(DataType_t type) { fDataFlag=type; }
-  
     void SetCheckedPixId ( const Int_t  i=fgCheckedPixId ) { fCheckedPixId  = i; }
 
@@ -76 +55 @@
     void SetHistsStorage ( const Bool_t b=kTRUE ) { b ? SETBIT(fStorage,kHistsStorage) : CLRBIT(fStorage,kHistsStorage); }
 
-    //void SetHiLoCalibration( const Bool_t b=kTRUE )  { fIsHiLoCalibration = b; }
     void SetPixelCheck     ( const Bool_t b=kTRUE )  { fIsPixelCheck        = b; }
     void SetPulsePosCheck  ( const Bool_t b=kTRUE )  { fIsPulsePosCheck     = b; }

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -768 +768 @@
         fExtractType = GetEnv("UseData",kFALSE) ? kUseData : kUsePedRun;
 
-    if (IsUseMC() && fExtractType==kUseData)
+    if (fSequence.IsMonteCarlo() && fExtractType==kUseData)
     {
         // The reason is, that the standard data files contains empty
@@ -870 +870 @@
     Float_t rmspulsetime   = 1.0;
 
-    if (!IsUseMC())
+    if (!fSequence.IsMonteCarlo())
     {
         if (fIsPixelCheck)
@@ -899 +899 @@
     }
 
-    *fLog << all << "Mean pulse time (" << (IsUseMC()?"MC":"cosmics") << "): ";
+    *fLog << all << "Mean pulse time (" << (fSequence.IsMonteCarlo()?"MC":"cosmics") << "): ";
     *fLog << meanpulsetime << "+-" << rmspulsetime << endl;
 
@@ -1033 +1033 @@
     {
         const Int_t n0 = IsUseData()
-            ? fSequence.SetupDatRuns(iter, 0, IsUseRawData())
-            : fSequence.SetupPedRuns(iter, 0, IsUseRawData());
+            ? fSequence.SetupDatRuns(iter, 0, !fSequence.IsMonteCarlo())
+            : fSequence.SetupPedRuns(iter, 0, !fSequence.IsMonteCarlo());
 
         if (n0<=0)
@@ -1040 +1040 @@
     }
 
-    if (IsUseRawData())
+    if (!fSequence.IsMonteCarlo())
     {
         rawread.AddFiles(iter);
@@ -1132 +1132 @@
     }
 
+    //MFillH fillC("MHPedestalCor", "MPedestalSubtractedEvt", "FillAcor");
+    //fillC.SetNameTab("Acor");
+    //if (fExtractor && fExtractionType==kWithExtractorRndm)
+    //    tlist.AddToList(&fillC);
+
     // ----------------------------------------------------------------------
     //   Now we make sure, that in all cases the ranges are setup correctly
@@ -1143 +1148 @@
     ftp2.RequirePedestal();
 
-    if (!IsUseMC() && (!fExtractor || !fExtractor->HasLoGain()))
+    if (!fSequence.IsMonteCarlo() && (!fExtractor || !fExtractor->HasLoGain()))
     {
         taskenv.SetFilter(&ftp2);
@@ -1224 +1229 @@
     }
 
+
+    /*
+    MHCamEvent evt0(0, "Ped",    "Pedestal;;P [cnts/sl]");
+    MHCamEvent evt1(2, "PedRms", "Pedestal RMS;;\\sigma_{p} [cnts/sl]");
+
+    MFillH fill0(&evt0, &fPedestalCamOut, "FillPedestal");
+    MFillH fill1(&evt1, &fPedestalCamOut, "FillPedRms");
+
+    tlist.AddToList(&fill0);
+    tlist.AddToList(&fill1);
+    */
+
     //
     // Execute the eventloop

trunk/MagicSoft/Mars/mmovie/MMovieWrite.cc

@@ -839 +839 @@
 //   MMovieWrite.NumEvents: 500
 //   MMovieWrite.Threshold: 2 <rms>
-//   MMovieWrite.Filename: movie.mpg
+//   MMovieWrite.FileName: movie.mpg
 //
 Int_t MMovieWrite::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
@@ -859 +859 @@
         rc = kTRUE;
     }
-    if (IsEnvDefined(env, prefix, "Filename", print))
-    {
-        fFilename = GetEnvValue(env, prefix, "Filename", fFilename);
+    if (IsEnvDefined(env, prefix, "FileName", print))
+    {
+        fFilename = GetEnvValue(env, prefix, "FileName", fFilename);
         rc = kTRUE;
     }