Changeset 2678 for trunk

Timestamp:

12/15/03 17:29:56 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• manalysis/MEventRateCalc.cc (modified) (2 diffs)
• mbase/MTime.cc (modified) (2 diffs)
• merpp.cc (modified) (8 diffs)
• mhist/MHCamera.cc (modified) (1 diff)
• mreport/MReport.cc (modified) (4 diffs)
• mreport/MReport.h (modified) (1 diff)
• mreport/MReportFileRead.cc (modified) (4 diffs)
• mreport/MReportFileRead.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
    * mfilter/MFAntiFilter.[h,cc]:
      - removed. This function is implemented in MFilterList
+
+   * merpp.cc:
+     - enhanced to support start/stop time
+
+   * manalysis/MEventRateCalc.cc:
+     - removed some stuff which was commented out
+     
+   * mbase/MTime.cc:
+     - small change to GetString
+     
+   * mhist/MHCamera.cc:
+     - made the inverse deep blue dea palette the default
+       (FIXME: Make this a resource)
+     
+   * mreport/MReport.[h,cc]:
+     - added MTime arguments to Interprete
+     
+   * mreport/MReportFileRead.[h,cc]:
+     - added MTime arguments to Interprete
+     - added fStart/fStop data member
 
 

trunk/MagicSoft/Mars/NEWS

@@ -12 +12 @@
 
    - added support for DC current files from the camera control
+
+   - added support for start- and stop-time when merpping report files
 
 

trunk/MagicSoft/Mars/manalysis/MEventRateCalc.cc

@@ -59 +59 @@
 //
 MEventRateCalc::MEventRateCalc(const char *name, const char *title)
-    : /*fNumEvents(10000),*/ fTimes(1000)
+    : fTimes(1000)
 {
     fName  = name  ? name  : "MEventRateCalc";
@@ -82 +82 @@
     if (!fRate)
         return kFALSE;
-
-    //fEvtNumber = 0;
 
     memset(fTimes.GetArray(), 0, sizeof(Double_t)*fTimes.GetSize());

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -229 +229 @@
 //
 // Return contents as a TString of the form:
-//   "[yy]yy/mm/dd [h]h:mm:ss.fff"
+//   "yyyy/mm/dd hh:mm:ss.fff"
 //
 TString MTime::GetString() const
@@ -239 +239 @@
     GetTime(h, m, s, ms);
 
-    return TString(Form("%2d/%02d/%02d %02d:%02d:%02d.%03d", y, mon, d, h, m, s, ms));
+    return TString(Form("%4d/%02d/%02d %02d:%02d:%02d.%03d", y, mon, d, h, m, s, ms));
 }
 

trunk/MagicSoft/Mars/merpp.cc

@@ -68 +68 @@
     gLog << "     -cn: Compression level n=1..9 [default=2]" << endl;
     gLog << "     -vn: Verbosity level n [default=2]" << endl;
+    gLog << "     --start=yyyy-mm-dd/hh:mm:ss.mmm: Start event time for merpping report files" << endl;
+    gLog << "     --stop=yyyy-mm-dd/hh:mm:ss.mmm:  Stop  event time for merpping report files" << endl;
     gLog << "     -?/-h: This help" << endl << endl;
     gLog << "   REMARK: At the moment you can process a .raw _or_ a .rep file, only!" << endl << endl;
 }
 
+// FIXME: Move to MTime (maybe 'InterpreteCmdline'
+MTime AnalyseTime(TString str)
+{
+    Int_t y=0, ms=0, mon=0, d=0, h=0, m=0, s=0;
+
+    if (7!=sscanf(str.Data(), "%d-%d-%d/%d:%d:%d.%d", &y, &mon, &d, &h, &m, &s, &ms))
+        return MTime();
+
+    MTime t;
+    t.Set(y, mon, d, h, m, s, ms);
+    return t;
+}
+
 int main(const int argc, char **argv)
 {
@@ -95 +110 @@
     gLog.SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
 
+    MTime kTimeStart(AnalyseTime(arg.GetStringAndRemove("--start=")));
+    MTime kTimeStop(AnalyseTime(arg.GetStringAndRemove("--stop=")));
+    kTimeStart.SetName("MTimeStart");
+    kTimeStop.SetName("MTimeStop");
+
+    if (!kTimeStart)
+        cout << "No start time!" << endl;
+    if (!kTimeStop)
+        cout << "No stop time!" << endl;
+
     //
     // check for the right usage of the program
@@ -172 +197 @@
     //
     // ---- The following is only necessary to supress some output ----
-    //
+    /*
     MRawRunHeader runheader;
     plist.AddToList(&runheader);
@@ -187 +212 @@
     MTime evttime;
     plist.AddToList(&evttime);
+    */
 
     //
@@ -200 +226 @@
     {
         MReportFileRead *r = new MReportFileRead(kNamein);
+        r->SetTimeStart(kTimeStart);
+        r->SetTimeStop(kTimeStop);
         if (isdc)
         {
@@ -215 +243 @@
 
         MWriteRootFile *w = new MWriteRootFile(kNameout, option, "Magic root-file", kComprlvl);
-        /*
-         w->AddContainer("MReportDAQ",         "DAQ");
-         w->AddContainer("MTimeDAQ",           "DAQ");
-         w->AddContainer("MReportDrive",       "Drive");
-         w->AddContainer("MTimeDrive",         "Drive");
-         */
         if (isdc)
         {
@@ -241 +263 @@
             w->AddContainer("MReportDrive",       "Drive");
             w->AddContainer("MTimeDrive",         "Drive");
+            // w->AddContainer("MReportDAQ",         "DAQ");
+            // w->AddContainer("MTimeDAQ",           "DAQ");
         }
         write = w;
@@ -249 +273 @@
         write = new MRawFileWrite(kNameout, option, "Magic root-file", kComprlvl);
     }
+
     tasks.AddToList(read);
     tasks.AddToList(write);

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -93 +93 @@
     SetPalette(1, 0);
 #else
-    SetPalette(51, 0);
+    SetInvDeepBlueSeaPalette();
 #endif
 }

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -53 +53 @@
 // While skip are numbers which won't enter the analysis
 //
+// SetupReading must be called successfully before.
+//
 Bool_t MReport::InterpreteHeader(TString &str)
 {
@@ -70 +72 @@
 
     fState=state;
-    if (fTime)
-        if (!fTime->Set(yea, mon, day, hor, min, sec, ms))
-        {
-            *fLog << err << "ERROR - Event has invalid time: ";
-            *fLog << Form("%d.%d.%d %02s:%02d:%02d.%03d", day, mon, yea, hor, min, sec, ms);
-            *fLog << "... abort." << endl;
-            return kFALSE;
-        }
+    if (!fTime->Set(yea, mon, day, hor, min, sec, ms))
+    {
+        *fLog << err << "ERROR - Event has invalid time: ";
+        *fLog << Form("%d.%d.%d %02s:%02d:%02d.%03d", day, mon, yea, hor, min, sec, ms);
+        *fLog << "... abort." << endl;
+        return kFALSE;
+    }
 
     str.Remove(0, len);
@@ -102 +103 @@
 // when a corresponding time container exists.
 //
-Bool_t MReport::Interprete(TString &str)
+// SetupReading must be called successfully before.
+//
+Int_t MReport::Interprete(TString &str, const MTime &start, const MTime &stop)
 {
     if (!InterpreteHeader(str))
         return kFALSE;
+
+    if (start && *fTime<start)
+        return kCONTINUE;
+    if (stop  && *fTime>stop)
+        return kCONTINUE;
 
     if (!InterpreteBody(str))
@@ -111 +119 @@
 
     SetReadyToSave();
-    if (fTime)
-        fTime->SetReadyToSave();
+    fTime->SetReadyToSave();
 
     return kTRUE;

trunk/MagicSoft/Mars/mreport/MReport.h

@@ -27 +27 @@
     virtual Bool_t InterpreteBody(TString &str);
 
-    Bool_t Interprete(TString &str);
+    Int_t  Interprete(TString &str, const MTime &start, const MTime &stop);
     Bool_t CheckIdentifier(TString &str) const
     {

trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

@@ -119 +119 @@
     MReport *GetReport() { return fReport; }
     //void SetTime(MTime *t) { fReport->SetTime(t); }
-    Bool_t Interprete(TString &str)
-    {
-        if (!fReport->Interprete(str))
+    Int_t Interprete(TString &str, const MTime &start, const MTime &stop)
+    {
+        const Int_t rc = fReport->Interprete(str, start, stop);
+
+        if (rc==kFALSE)
             return kFALSE;
 
         fNumReports++;
-        return kTRUE;
+        return rc;
     }
     Bool_t SetupReading(MParList &plist) { return fReport->SetupReading(plist); }
@@ -289 +291 @@
     while (!GetReport(rep))
     {
-        // Don't know the reason, but ReadLine and ReadString don't work
-        // for the (at least: converted) DC files.
-        str.ReadToDelim(*fIn);
+        str.ReadLine(*fIn);
         if (!*fIn)
         {
@@ -307 +307 @@
     }
 
-    if (!rep->Interprete(str))
+    const Int_t rc = rep->Interprete(str, fStart, fStop);
+    if (rc==kFALSE)
     {
         *fLog << err << "ERROR - Interpretation of '" << rep->GetName() << "' failed." << endl;
@@ -313 +314 @@
     }
 
-    return kTRUE;
+    return rc;
 }
 

trunk/MagicSoft/Mars/mreport/MReportFileRead.h

@@ -5 +5 @@
 #include "MTask.h"
 #endif
+#ifndef MARS_MTime
+#include "MTime.h"
+#endif
 
-// gcc 3.2
+/*// gcc 3.2
 //class ifstream;
 #include <iosfwd>
+*/
 
 class THashTable;
@@ -27 +31 @@
     THashTable *fList;
 
+    MTime fStart;            // Time range which should be read from file
+    MTime fStop;             // Time range which should be read from file
+
     enum { kHasNoHeader = BIT(14) };
 
@@ -43 +50 @@
 
     void SetHasNoHeader() { SetBit(kHasNoHeader); }
+    void SetTimeStart(const MTime &tm) { fStart = tm; }
+    void SetTimeStop(const MTime &tm)  { fStop = tm; }
 
     Bool_t AddToList(const char *name) const;