Changeset 8411 for trunk

Timestamp:

04/18/07 10:00:04 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mjobs/Makefile (modified) (1 diff)
• mmovie/MMoviePrepare.cc (modified) (9 diffs)
• mmovie/MMoviePrepare.h (modified) (2 diffs)
• mmovie/MMovieWrite.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/04/18 Thomas Bretz
+
+   * mjobs/Makefile:
+     - added path to mmovie
+
+   * mmovie/MMoviePrepare.[h,cc]:
+     - changed access to MCalibrateData to access to MCalibConstCam
+
+   * mmovie/MMovieWrite.cc:
+     - fixed some typos in comments
+
+
+
  2007/04/17 Stefan Ruegamer
 
@@ -24 +37 @@
      - modified the ccfile search to not find ccfiles twice if one
        runnumber is part of a higher runnumber (as 23456 and 223456)
+
    * datacenter/scripts/movingrawfiles:
      - added moving of rawfiles from the directory /magic/datacenter/
        fromtape/rawdata/muxdata, which is the default rawfile folder of
        the new muxtapes, to /magic/datacenter/fromtape/rawdata
+
    * datacenter/scripts/runcallisto:
      - added condition for the linking of the .rc-file for muxdata
+
    * datacenter/scripts/makecallistolinks:
      - commented reason2 out

trunk/MagicSoft/Mars/mjobs/Makefile

@@ -23 +23 @@
            -I../mbadpixels -I../msignal -I../mraw -I../mpedestal -I../mtools \
            -I../mimage -I../mpointing -I../mastro -I../mfbase -I../mhvstime \
-           -I../mtrigger -I../mmuon -I../mmc
+           -I../mtrigger -I../mmuon -I../mmc -I../mmovie
 
 SRCFILES = MSequence.cc \

trunk/MagicSoft/Mars/mmovie/MMoviePrepare.cc

@@ -49 +49 @@
 //   MPedestalSubtractedEvt
 //   MPedestalFundamental [MPedestalCam]
-//   MCalibrateData
+//   MCalibConstCam
 //   MCalibrationRelTimeCam
 //   MRawRunHeader
@@ -75 +75 @@
 #include "MPedestalPix.h"
 
+#include "MCalibConstCam.h"
+#include "MCalibConstPix.h"
 
 #include "MCalibrationRelTimeCam.h"
@@ -82 +84 @@
 #include "MMovieData.h"
 #include "MRawRunHeader.h"
-#include "MCalibrateData.h"
 #include "MPedestalSubtractedEvt.h"
 
@@ -143 +144 @@
         return kFALSE;
     }
-    fCal = (MCalibrateData*)plist->FindTaskListWithTask("MCalibrateData")->FindTask("MCalibrateData");
+    fCal = (MCalibConstCam*)plist->FindObject("MCalibConstCam");
     if (!fCal)
     {
-        *fLog << err << "MCalibrateData not found ... aborting." << endl;
+        *fLog << err << "MCalibConstCam not found ... aborting." << endl;
         return kFALSE;
     }
@@ -193 +194 @@
 Double_t MMoviePrepare::GetMedianCalibConst() const
 {
-    const MArrayF &calco = fCal->GetCalibConsts();
-
     Int_t n = fCam->GetNumPixWithAidx(0);
 
@@ -201 +200 @@
     for (UInt_t i=0; i<fCam->GetNumPixels(); i++)
         if ((*fCam)[i].GetAidx()==0)
-            arr[--n] = calco[i];
+            arr[--n] = (*fCal)[i].GetCalibConst();
 
     return TMath::Median(arr.GetSize(), arr.GetArray());
@@ -246 +245 @@
 
     // For invalid calib constants we can use the sector average
-    const MArrayF &calco = fCal->GetCalibConsts();
     const UShort_t npix  = fEvt->GetNumPixels();
     const Double_t slope = 1./GetMedianCalibConst();
@@ -258 +256 @@
 
         const Float_t  offset = tpix.GetTimeOffset();
-        const Float_t  cal    = calco[p];
+        const Float_t  cal    = (*fCal)[p].GetCalibConst();
         const Float_t *ptr    = fEvt->GetSamples(p)+fFirstSlice;
         const Float_t  scale  = cal*slope*fCam->GetPixRatio(p);
@@ -290 +288 @@
 //
 // Example:
-//   MMoviewPrepare.FirstSlice: 10
-//   MMoviewPrepare.LastSlice:  50
+//   MMoviePrepare.FirstSlice: 10
+//   MMoviePrepare.LastSlice:  50
 //
 Int_t MMoviePrepare::ReadEnv(const TEnv &env, TString prefix, Bool_t print)

trunk/MagicSoft/Mars/mmovie/MMoviePrepare.h

@@ -11 +11 @@
 class MPedestalCam;
 class MRawRunHeader;
-class MCalibrateData;
+class MCalibConstCam;
 class MCalibrationRelTimeCam;
 class MPedestalSubtractedEvt;
@@ -19 +19 @@
 private:
     MPedestalSubtractedEvt *fEvt;    //! Slices with pedestal subtracted
-    MCalibrateData         *fCal;    //! Calibration constants signal
+    MCalibConstCam         *fCal;    //! Calibration constants signal
     MCalibrationRelTimeCam *fRel;    //! Calibration constants time
     MRawRunHeader          *fRun;    //! Run Header (sampling frequency)

trunk/MagicSoft/Mars/mmovie/MMovieWrite.cc

@@ -815 +815 @@
 //
 // Example:
-//   MMoviewPrepare.TargetLength: 5 <seconds>
-//   MMoviewPrepare.NumEvents: 500
-//   MMoviewPrepare.Threshold: 2 <rms>
-//   MMoviewPrepare.Filename: movie.mpg
+//   MMoviePrepare.TargetLength: 5 <seconds>
+//   MMoviePrepare.NumEvents: 500
+//   MMoviePrepare.Threshold: 2 <rms>
+//   MMoviePrepare.Filename: movie.mpg
 //
 Int_t MMovieWrite::ReadEnv(const TEnv &env, TString prefix, Bool_t print)