Changeset 2711 for trunk/MagicSoft/Mars

Timestamp:

12/18/03 15:48:42 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile.rules (modified) (1 diff)
• mbase/MAGIC.h (modified) (1 diff)
• merpp.cc (modified) (3 diffs)
• mreport/MReportCC.cc (modified) (4 diffs)
• mreport/MReportFileRead.cc (modified) (8 diffs)
• mreport/MReportFileRead.h (modified) (2 diffs)
• mreport/MReportRun.cc (modified) (2 diffs)
• mtools/MTFillMatrix.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -14 +14 @@
    * manalysis/MExetractedSignalPix.h:
      - added missing const-qualifier IsLoGainUsed
+
+   * mreport/MReportFileRead.[h,cc]:
+     - added support for line counter
 
    * mreport/MReportRun.[h,cc]:

trunk/MagicSoft/Mars/Makefile.rules

@@ -50 +50 @@
 rmbin:  
         @echo " Removing binary files..."
-        @rm -f $(PROGRAMS) lib/$(SOLIB) so_locations
+        @rm -f $(PROGRAMS) $(SOLIB) so_locations
 
 rmbak:

trunk/MagicSoft/Mars/mbase/MAGIC.h

@@ -16 +16 @@
 //
 #ifndef __CINT__
-#if ROOT_VERSION_CODE < ROOT_VERSION(3,02,00)
-#error Your root version is too old to compile Mars, use root>=3.02
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,05,06)
+#error Your root version is too old to compile Mars, use root>=3.05/06
 #endif
 #endif

trunk/MagicSoft/Mars/merpp.cc

@@ -120 +120 @@
     const Int_t kRunNumber = arg.HasOption("--run=") ? arg.GetIntAndRemove("--run=") : -1;
 
-    if (!kTimeStart)
-        cout << "No start time!" << endl;
-    if (!kTimeStop)
-        cout << "No stop time!" << endl;
+    if (kTimeStart)
+        gLog << inf << "Start Time: " << kTimeStart << endl;
+    if (kTimeStop)
+        gLog << inf << "Stop  Time: " << kTimeStop << endl;
 
     //
@@ -270 +270 @@
         {
             r->AddToList("MReportCC");
-            r->AddToList("MReportDAQ");
+            //r->AddToList("MReportDAQ");
             r->AddToList("MReportDrive");
             r->AddToList("MReportCamera");
@@ -277 +277 @@
             {
                 r->AddToList("MReportRun");
-                filter = new MFDataMember("MReportRun.fRunNumber", '=', kRunNumber-0.5);
-                filter->SetInverted();
+                filter = new MFDataMember("MReportRun.fRunNumber", '=', kRunNumber);
                 w->SetFilter(filter);
             }

trunk/MagicSoft/Mars/mreport/MReportCC.cc

@@ -43 +43 @@
 using namespace std;
 
-MReportCC::MReportCC() : MReport("CC-REPORT")
+MReportCC::MReportCC() : MReport("CC-REPORT", kFALSE)
 {
     fName  = "MReportCC";
@@ -57 +57 @@
 
     Int_t len;
-    Float_t zd, az, dec, ra;
     const Int_t n=sscanf(str.Data(),
                          "%*f %*f %*f %*f %f %f %f %f %*f %*f %n",
@@ -67 +66 @@
         return kFALSE;
     }
+    /*
     str.Remove(0, len);
+
+    *fLog << dbg << str << endl;
 
     if (str!=(TString)"OVER")
@@ -74 +76 @@
         return kFALSE;
     }
-
+    */
     return kTRUE;
 }

trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

@@ -207 +207 @@
 // file versions
 //
-Bool_t MReportFileRead::CheckFileHeader() const
-{
+Int_t MReportFileRead::CheckFileHeader() const
+{
+    Int_t line = 0;
+
     TString str;
     str.ReadLine(*fIn);   // Read to EOF or newline
@@ -215 +217 @@
         *fLog << err << "ERROR - First line doesn't match '" << gsReportHeader <<"' ";
         *fLog << "in file '" << fFileName << "'"<<endl;
-        return kFALSE;
-    }
+        return line;
+    }
+    line++;
 
     str.ReadLine(*fIn);   // Read to EOF or newline
@@ -223 +226 @@
         *fLog << err << "ERROR - Version prefix '" << gsVersionPrefix <<"' ";
         *fLog << "not found in second line of file '" << fFileName << "'"<<endl;
-        return kFALSE;
-    }
+        return line;
+    }
+    line++;
 
     str.Remove(0, gsVersionPrefix.Length());
@@ -234 +238 @@
         *fLog << err << "ERROR - Version string '" << str <<"' doesn't ";
         *fLog << "match regular expression." << endl;
-        return kFALSE;
+        return line;
     }
 
     *fLog << dbg << "Report File version: <" << ver << ">" << endl;
 
-    return kTRUE;
+    return line;
 }
 
@@ -252 +256 @@
     //if (!time)
     //    return kFALSE;
+    fNumLine = 0;
 
     TIter Next(fList);
@@ -275 +280 @@
         return kTRUE;
 
-    return CheckFileHeader();
+    const Int_t n = CheckFileHeader();
+    fNumLine += n;
+    return n==2;
 }
 
@@ -298 +305 @@
         }
 
+        fNumLine++;
+
         const Int_t pos = str.First(' ');
         if (pos<=0)
@@ -310 +319 @@
     if (rc==kFALSE)
     {
-        *fLog << err << "ERROR - Interpretation of '" << rep->GetName() << "' failed." << endl;
+        *fLog << err << "ERROR - Interpretation of '" << rep->GetName() << "' failed (Line #" << fNumLine << ")" << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mreport/MReportFileRead.h

@@ -34 +34 @@
     MTime fStop;             // Time range which should be read from file
 
+    ULong_t fNumLine;        // line counter
+
     enum { kHasNoHeader = BIT(14) };
 
@@ -40 +42 @@
     Int_t PostProcess();
 
-    Bool_t CheckFileHeader() const;
+    Int_t CheckFileHeader() const;
     MReport *GetReport(const TString &str) const;
     MReport *GetReport(MReportHelp *help) const;

trunk/MagicSoft/Mars/mreport/MReportRun.cc

@@ -50 +50 @@
 Bool_t MReportRun::InterpreteBody(TString &str)
 {
-    // Remove the 30 tokens of the subsystem status
-    //  table 12.1 p59
-    for (int i=0; i<30; i++)
-        str.Remove(0, str.First(' ')+1);
-
     Int_t len;
     const Int_t n=sscanf(str.Data(), "%d %n", &fRunNumber, &len);
@@ -69 +64 @@
     str.Remove(0, 6);
     str = str.Strip(TString::kBoth);
-    fSourceName = str(0, str.First(' ')+1);
+    Ssiz_t pos = str.First(' ');
+    if (pos<0)
+        pos = str.Length();
+    fSourceName = str(0, pos+1);
 
     return kTRUE;

trunk/MagicSoft/Mars/mtools/MTFillMatrix.cc

@@ -134 +134 @@
         return kFALSE;
     }
+    if (fname.IsNull())
+    {
+        *fLog << "ERROR - Unable to write matrix, file name empty." << endl;
+        return kFALSE;
+    }
 
     TFile file(fname, "RECREATE", m->GetTitle());
@@ -245 +250 @@
     MEvtLoop evtloop(fName);
     evtloop.SetParList(&plist);
+    evtloop.SetDisplay(fDisplay);
+    evtloop.SetLogStream(fLog);
     if (!evtloop.Eventloop())
     {