Changeset 4875

Timestamp:

09/07/04 11:26:14 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• merpp.cc (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mraw/MRawRunHeader.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/merpp.cc

@@ -76 +76 @@
     gLog << " File Options:" << endl;
     gLog << "   -c#                       Compression level #=1..9 [default=2]" << endl;
-    gLog << "   -f                        Force overwrite of an existing file" << endl << endl;
+    gLog << "   -f                        Force overwrite of an existing file" << endl;
+    gLog << "   -u, --update              Update an existing file." << endl << endl;
     gLog << " Raw Data Options:" << endl;
     gLog << "   -ff                       Force merpp to ignore broken events" << endl;

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -250 +250 @@
 
     if (!geom.IsNull())
-        *fLog << inf << "Camera geometry found in file: " << geom.ClassName() << endl;
+        *fLog << inf << "Camera geometry found in file: " << geom << endl;
     else
         *fLog << inf << "No Camera geometry found using default <MGeomCamMagic>" << endl;

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -211 +211 @@
 // --------------------------------------------------------------------------
 //
-// print run header information on *fLog
+// print run header information on *fLog. The option 'header' supresses
+// the pixel index translation table.
 //
 void MRawRunHeader::Print(Option_t *t) const
@@ -236 +237 @@
     *fLog << "Evt Counter:  " << fNumEvents << endl;
 
+    if (TString(t).Contains("header", TString::kIgnoreCase))
+        return;
+
     *fLog << inf << hex;
     for (int i=0; i<GetNumPixel(); i++)