Changeset 8434 for trunk/MagicSoft/Mars/mmovie

Timestamp:

04/23/07 20:11:25 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmovie

Files:

• MMovieWrite.cc (modified) (6 diffs)
• MMovieWrite.h (modified) (2 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mmovie/MMovieWrite.cc

@@ -78 +78 @@
 //   MBadPixelsCam
 //   MMovieData
+//   [MMcEvt]
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -97 +98 @@
 #include "MGeomCam.h"
 #include "MGeomPix.h"
+
+#include "MMcEvt.hxx"
 
 #include "MH.h"
@@ -279 +282 @@
         return kFALSE;
     }
+
+    fMC = (MMcEvt*)plist->FindObject("MMcEvt");
 
     return OpenPipe();
@@ -592 +597 @@
 
     const Double_t rms = fIn->GetMedianPedestalRms();
-
-    h.SetMinimum(fIn->GetMax()-(fIn->GetMax()-rms)*99/98); // rms0
-    h.SetMaximum(fIn->GetMax());
+    const Double_t max = fIn->GetMax();    // scale the lover limit such
+    const Double_t dif = (max-rms)*99/98;  // that everything below rms is
+    const Double_t min = max-dif;          // displayed as white
+
+    // If the maximum is equal or less the
+    // pedestal rms something must be wrong
+    if (dif<=0)
+        return kFALSE;
+
+    h.SetMinimum(min);
+    h.SetMaximum(max);
 
     // -----------------------------------------
@@ -763 +776 @@
 
     cout << "MED=" << rms0 << endl;
-  */
+    */
+
+    TString s = Form("%d: ", GetNumExecutions()+1);
+    s += "Evt #";
+    s += fHead->GetDAQEvtNumber();
+    s += " of ";
+    s += "Run #";
+    s += fRun->GetRunNumber();
+    if (fMC)
+        s = fMC->GetDescription(s);
+
     MHCamera h(*fCam);
-    h.SetTitle(Form("%d: Run #%d,  Evt %d", GetNumExecutions()+1,
-                    fRun->GetRunNumber(), fHead->GetDAQEvtNumber()));
+    h.SetTitle(s);
     h.SetAllUsed();
     h.SetYTitle("V [au]");
@@ -815 +837 @@
 //
 // Example:
-//   MMoviePrepare.TargetLength: 5 <seconds>
-//   MMoviePrepare.NumEvents: 500
-//   MMoviePrepare.Threshold: 2 <rms>
-//   MMoviePrepare.Filename: movie.mpg
+//   MMovieWrite.TargetLength: 5 <seconds>
+//   MMovieWrite.NumEvents: 500
+//   MMovieWrite.Threshold: 2 <rms>
+//   MMovieWrite.Filename: movie.mpg
 //
 Int_t MMovieWrite::ReadEnv(const TEnv &env, TString prefix, Bool_t print)

trunk/MagicSoft/Mars/mmovie/MMovieWrite.h

@@ -9 +9 @@
 class TASImage;
 
+class MMcEvt;
 class MGeomCam;
 class MMovieData;
@@ -26 +27 @@
     MBadPixelsCam *fBad;   //! Information about bad pixels
     MPedestalCam  *fPed;   //! Fundamental pedestal for palette and cleaning
+    MMcEvt        *fMC;    //! Informatio about MC events
 
     MMovieData    *fIn;    //! Input data with splines for all pixels

trunk/MagicSoft/Mars/mmovie/Makefile

@@ -21 +21 @@
 INCLUDES = -I. -I../mbase -I../mraw -I../mgeom -I../mhbase -I../mgui \
            -I../mcalib -I../msignal -I../mbadpixels -I../mpedestal   \
-           -I../mhist
+           -I../mhist -I../mmc
 
 SRCFILES = MMoviePrepare.cc \