Changeset 9369 for trunk/MagicSoft/Mars/mmovie

Timestamp:

03/01/09 21:54:27 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmovie/MMovieWrite.cc (modified) (13 diffs)

trunk/MagicSoft/Mars/mmovie/MMovieWrite.cc

@@ -290 +290 @@
 }
 
+#ifdef USE_TIMING
 TStopwatch clockT, clock1, clock2, clock3;
+#endif
 
 // --------------------------------------------------------------------------
@@ -304 +306 @@
     }
 
+#ifdef USE_TIMING
     *fLog << all << endl;
     *fLog << "Snap: " << flush;
@@ -314 +317 @@
     clockT.Print();
     *fLog << endl;
+#endif
 
     return kTRUE;
@@ -338 +342 @@
 
     double r[6] = {1.0, 1.0,  1.0, 0.85,  0.1,     0.0 };
-    double g[6] = {1.0, 1.0,  1.0, 0.0,   0.1,     0.0 };
-    double b[6] = {0.9, 0.55, 0.4, 0.0,   0.7,     0.1 };
+    double g[6] = {1.0, 1.0,  1.0, 0.15,  0.1,     0.0 };
+    double b[6] = {0.9, 0.55, 0.4, 0.15,  0.7,     0.1 };
 
     TArrayI col(99);
@@ -481 +485 @@
     UInt_t *argb = img.GetArgbArray();
     for (UInt_t *ptr=argb; ptr<argb+img.GetWidth()*img.GetHeight(); ptr++)
-        fwrite(ptr, 1, 3, fPipe);
+        if (fwrite(ptr, 3, 1, fPipe)!=1)
+            break;
 
     return CheckPipe();
@@ -493 +498 @@
 Bool_t MMovieWrite::WriteImage(TASImage &img, TVirtualPad &pad)
 {
+#ifdef USE_TIMING
     clock1.Start(kFALSE);
     UpdateImage(img, pad);
@@ -502 +508 @@
 
     return rc;
+#else
+    UpdateImage(img, pad);
+    return WriteImage(img);
+#endif
 }
 
@@ -524 +534 @@
             continue;
 
-        const MGeomPix &gpix = (*fCam)[i];
+        const MGeom &gpix = (*fCam)[i];
 
         Int_t    num = 0;
@@ -572 +582 @@
             continue;
 
-        const MGeomPix &gpix = (*fCam)[i];
+        const MGeom &gpix = (*fCam)[i];
 
         //
@@ -671 +681 @@
 Int_t MMovieWrite::Process()
 {
+#ifdef USE_TIMING
     clockT.Start(kFALSE);
 
     clock3.Start(kFALSE);
-
+#endif
     // ---------------- Prepare display ------------------
 
@@ -802 +813 @@
     // ---------------- Show data ------------------
     gStyle->SetOptStat(1000000001);
-/*                     
+/*
     p0.Modified();
     p1.Modified();
@@ -815 +826 @@
 
     // ---------------- Show data ------------------
-
+#ifdef USE_TIMING
     clock3.Stop();
+#endif
 
     // Switch off automatical adding to directory (SetName would do)
@@ -827 +839 @@
     TH1::AddDirectory(add);
 
+#ifdef USE_TIMING
     clockT.Stop();
+#endif
 
     gROOT->SetBatch(batch);