Changeset 2299 for trunk

Timestamp:

08/01/03 16:28:20 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (4 diffs)
• mbase/MEvtLoop.h (modified) (1 diff)
• merpp.cc (modified) (6 diffs)
• mmain/MStatusDisplay.cc (modified) (2 diffs)
• mraw/MRawFileRead.cc (modified) (1 diff)
• mraw/MRawRunHeader.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
    * mranforest/MRanForestFill.[h,cc]:
      - default fNumTrees set to -1 tree (all trees)
+
+   * manalysis/MBlindPixelCalc.[h,cc]:
+     - interpolate Pedestal, too
+     - Only count 'valid' pixels
+     
+   * mfileio/MRead.[h,cc]:
+     - enhanced AddFiles
+     
+   * mhist/MHCamEvent.[h,cc]:
+     - Added PrintOutlayers
+
+   * mhist/MHCamera.[h,cc]:
+     - added GetNumPixels
+     - added default to GetMean and GetRMS
+
+   * mhist/MHTriggerLvl0.[h,cc]:
+     - added PrintOutlayers
+
+   * merpp.cc:
+     - added more arguments
+     - replace .raw by .root if no root file given
+     - automatic extension adding
+     
+   * mbase/MEvtLoop.[h,cc]:
+     - added estimated run time
+     - in Process: Changes type of rc from Bool_t to Int_t 
+     
+   * mmain/MStatusDisplay.cc:
+     - changed order in Tab-menu
+     
+   * mraw/MRawFileRead.cc:
+     - consistency check for 0xc0c1 files
+     
+   * mraw/MRawRunHeader.cc:
+     - initialize variables
+     - added 0xc0c1 support
 
 

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -267 +267 @@
 }
 
-Bool_t MEvtLoop::ProcessGuiEvents(Int_t num)
+Bool_t MEvtLoop::ProcessGuiEvents(Int_t num, Int_t entries)
 {
     if (!fProgress || gROOT->IsBatch())
@@ -320 +320 @@
             txt += " (";
             txt += speed;
-            txt += "Evts/s)";
+            txt += "Evts/s, est: ";
+            txt += (int)((long int)(t0-t2)*entries/(60000.*(num-start)));
+            txt += "m";
+            //txt += (int)fmod(entries/(1000.*(num-start)/(long int)(t0-t2)), 60);
+            //txt += "s";
+            txt += ")";
         }
         fDisplay->SetStatusLine1(txt);
@@ -416 +421 @@
         {
             numcnts++;
-            if (!ProcessGuiEvents(++dummy))
+            if (!ProcessGuiEvents(++dummy, entries))
                 break;
         }
@@ -424 +429 @@
         {
             numcnts++;
-            if (!ProcessGuiEvents(maxcnt - dummy))
+            if (!ProcessGuiEvents(maxcnt - dummy, entries))
                 break;
         }

trunk/MagicSoft/Mars/mbase/MEvtLoop.h

@@ -37 +37 @@
     void StreamPrimitive(ofstream &out) const;
 
-    Bool_t ProcessGuiEvents(Int_t num);
+    Bool_t ProcessGuiEvents(Int_t num, Int_t entries);
 
 public:

trunk/MagicSoft/Mars/merpp.cc

@@ -39 +39 @@
 {
     gLog << "Sorry the usage is:" << endl;
-    gLog << "   merpp [-vn] inputfile outputfile [compression level]" << endl << endl;
+    gLog << "   merpp [-a0] [-vn] [-cn] inputfile[.raw] [outputfile[.root]]" << endl << endl;
     gLog << "     input file:   Magic DAQ binary file." << endl;
     gLog << "     ouput file:   Merpped root file." << endl;
-    gLog << "     compr. level: 1..9 [default=1]" << endl;
+    gLog << "     -a0: Do not use Ansii codes." << endl;
+    gLog << "     -cn: Compression level n=1..9 [default=1]" << endl;
     gLog << "     -vn: Verbosity level n [default=2]" << endl << endl;
 }
@@ -49 +50 @@
 {
     MArgs arg(argc, argv);
-    arg.Print();
 
     gLog << "==================================================" << endl ;
@@ -60 +60 @@
 
     //
+    // Set verbosity to highest level.
+    //
+    gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
+
+    if (arg.HasOption("-a") && arg.GetIntAndRemove("-a")==0)
+        gLog.SetNoColors();
+
+    const int kComprlvl = arg.HasOption("-c") ? arg.GetIntAndRemove("-c") : 1;
+
+    //
     // check for the right usage of the program
     //
-    if (arg.GetNumArguments()<2 || arg.GetNumArguments()>3)
+    if (arg.GetNumArguments()<1 || arg.GetNumArguments()>2)
     {
         Usage();
@@ -69 +79 @@
 
     //
-    // Set verbosity to highest level.
-    //
-    gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetInt("-v") : 2);
-
-    //
     // This is to make argv[i] more readable insidethe code
     //
-    const char *kNamein   = arg.GetArgumentStr(0);
-    const char *kNameout  = arg.GetArgumentStr(1);
-    const int   kComprlvl = arg.GetNumArguments()==3 ? arg.GetArgumentInt(2) : 1;
+    TString kNamein  = arg.GetArgumentStr(0);
+    TString kNameout = arg.GetArgumentStr(1);
 
     //
@@ -85 +89 @@
     TROOT merpp("merpp", "Mars - Merging and Preprocessing Program");
     merpp.SetBatch();
+
+    if (!kNamein.EndsWith(".raw"))
+        kNamein += ".raw";
+
+    if (kNameout.IsNull())
+        kNameout = kNamein(0, kNamein.Last('.'));
+
+    if (!kNameout.EndsWith(".root"))
+        kNameout += ".root";
 
     //
@@ -117 +130 @@
 
     //
-    // ---- Tho following is only necessary to supress some output ----
+    // ---- The following is only necessary to supress some output ----
     //
     MRawRunHeader runheader;

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -194 +194 @@
     MGPopupMenu *tabmenu = new MGPopupMenu(gClient->GetRoot());
     // tabmenu->AddEntry("Save &As...", kFileSaveAs);
+    tabmenu->AddEntry("Next [&+]",           kTabNext);
+    tabmenu->AddEntry("Previous [&-]",       kTabPrevious);
+    tabmenu->AddSeparator();
     tabmenu->AddEntry("Save As tab-i.&ps",   kTabSaveAsPS);
     tabmenu->AddEntry("Save As tab-i.&gif",  kTabSaveAsGIF);
@@ -202 +205 @@
     tabmenu->AddSeparator();
     tabmenu->AddEntry("Print with &lpr",     kFilePrint);
-    tabmenu->AddSeparator();
-    tabmenu->AddEntry("Next [&+]",           kTabNext);
-    tabmenu->AddEntry("Previous [&-]",       kTabPrevious);
     tabmenu->Associate(this);
 

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -223 +223 @@
     {
         fRawCrateArray->GetEntry(i)->ReadEvt(*fIn);
+        if (!*fIn)
+            return kFALSE;
 
         fRawEvtData->ReadEvt(*fIn);
+        if (!*fIn)
+            return kFALSE;
     }
 

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -56 +56 @@
 
     fPixAssignment = new MArrayS(0);
+
+    fFormatVersion=0;
+    fSoftVersion=0;
+    fRunType=0;
+    fRunNumber=0;
+    fProjectName[0]=0;
+    fSourceName[0]=0;
+    fSourceEpochChar[0]=0;
+    fSourceEpochDate=0;
+    fMJD=0;
+    fDateYear=0;
+    fDateMonth=0;
+    fDateDay=0;
+    fNumCrates=0;
+    fNumPixInCrate=0;
+    fNumSamplesLoGain=0;
+    fNumSamplesHiGain=0;
+    fNumEvents=0;
 }
 
@@ -76 +94 @@
     // read one RUN HEADER from the input stream
     //
-    fin.read((char*)&fMagicNumber,       2);
+    fin.read((char*)&fMagicNumber, 2);
 
     //
     // check whether the the file has the right file type or not
     //
-    if (fMagicNumber != kMagicNumber)
+    if (fMagicNumber != kMagicNumber && fMagicNumber != kMagicNumber+1)
     {
         *fLog << err << "Error: Wrong Magic Number: Not a Magic File!" << endl;
         return;
     }
+
+    if (fMagicNumber == kMagicNumber && fMagicNumber != kMagicNumber+1)
+        *fLog << warn << "WARNING - This file maybe broken (0xc0c1) - DAQ didn't close it correctly!" << endl;
 
     Byte_t dummy[16];