Changeset 2632 for trunk/MagicSoft

Timestamp:

12/10/03 11:56:33 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/readcurrents.C (modified) (3 diffs)
• mcamera/CameraLinkDef.h (modified) (1 diff)
• mcamera/MCameraDC.cc (added)
• mcamera/MCameraDC.h (added)
• mcamera/Makefile (modified) (2 diffs)
• merpp.cc (modified) (5 diffs)
• mhist/MHVsTime.cc (modified) (1 diff)
• mraw/MRawFileRead.cc (modified) (3 diffs)
• mreport/MReport.cc (modified) (2 diffs)
• mreport/MReportCurrents.cc (modified) (5 diffs)
• mreport/MReportCurrents.h (modified) (2 diffs)
• mreport/MReportFileRead.cc (modified) (2 diffs)
• mreport/MReportFileRead.h (modified) (2 diffs)
• mreport/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -8 +8 @@
    * manalysis/MPedPhotPix.[h,cc], manalysis/MPedPhotCam.[h,cc]:
      - added
+
+   * merpp.cc:
+     - added support for dc report files
+     
+   * mcamera/CameraLinkDef.h, mcamera/Makefile:
+     - added MCameraDC
+     
+   * mhist/MHVsTime.cc:
+     - fixed a missing initialisation
+
+   * mraw/MRawFileRead.cc:
+     - fixed wrong MRawEvtTime name
+     
+   * mreport/MReport.cc:
+     - fixed reading of dc files
+     
+   * mreport/MReportCurrents.[h,cc]:
+     - do not store currents here. store it in MCameraDC
+     
+   * mreport/MReportFileRead.[h,cc]:
+     - replaced non working ReadLine by ReadToDelim (reason unknown!)
+     - added SetHasNoHeader and kHasNoHeader
 
 

trunk/MagicSoft/Mars/macros/readcurrents.C

@@ -50 +50 @@
 
     MGeomCamMagic geomcam;
-    MCurrents     cur;
+    MCameraDC     cur;
     MTaskList     tlist;
 
@@ -57 +57 @@
     plist.AddToList(&tlist);
 
-    MReadCurrents read(fname);
-    /*
-     read.AddFile("../currents/dcs_arcturus2.dat");
-     read.AddFile("../currents/dcs_arcturus3.dat");
-     read.AddFile("../currents/dcs_arcturus4.dat");
-     read.AddFile("../currents/dcs_arcturus5.dat");
-     read.AddFile("../currents/dcs_arcturus6.dat");
-     read.AddFile("../currents/dcs_arcturus7.dat");
-     read.AddFile("../currents/dcs_arcturus8.dat");
-     read.AddFile("../currents/dcs_arcturus9.dat");
-     read.AddFile("../currents/dcs_arcturus10.dat");
-     */
+    MReportFileRead read(fname);
+    read.SetHasNoHeader();
+    read.AddToList("MReportCurrents");
+
     tlist.AddToList(&read);
 
@@ -91 +83 @@
         // Remove the comments if you want to go through the file
         // event-by-event:
-        //        if (!HandleInput())
-        //            break;
+        if (!HandleInput())
+            break;
     } 
 

trunk/MagicSoft/Mars/mcamera/CameraLinkDef.h

@@ -11 +11 @@
 #pragma link C++ class MCameraHV+;
 #pragma link C++ class MCameraLV+;
+#pragma link C++ class MCameraDC+;
 #pragma link C++ class MCameraCalibration+;
 #pragma link C++ class MCameraPowerSupply+;

trunk/MagicSoft/Mars/mcamera/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase
+INCLUDES = -I. -I../mbase -I../mgui
+# mgui - MCameraDC <MCamEvent>
 
 #------------------------------------------------------------------------------
@@ -33 +34 @@
            MCameraHV.cc \
            MCameraLV.cc \
+           MCameraDC.cc \
            MCameraLid.cc \
            MCameraLids.cc \

trunk/MagicSoft/Mars/merpp.cc

@@ -59 +59 @@
     gLog << "Sorry the usage is:" << endl;
     gLog << "   merpp [-h] [-?] [-a0] [-vn] [-cn] [-u1]" << endl;
-    gLog << "         inputfile[.rep,[.raw]] [outputfile[.root]]" << endl << endl;
+    gLog << "         inputfile[.rep,[.raw],[.txt]] [outputfile[.root]]" << endl << endl;
     gLog << "     inputfile.raw:  Magic DAQ binary file." << endl;
     gLog << "     inputfile.rep:  Magic Central Control report file." << endl;
+    gLog << "     inputfile.txt:  Magic DC currents file." << endl;
     gLog << "     ouputfile.root: Merpped root file." << endl;
     gLog << "     -a0: Do not use Ansii codes." << endl;
@@ -110 +111 @@
 
     const Bool_t isreport = kNamein.EndsWith(".rep");
-
-    if (!kNamein.EndsWith(".raw") && !isreport)
+    const Bool_t isdc     = kNamein.EndsWith(".txt");
+
+    if (!kNamein.EndsWith(".raw") && !isreport && !isdc)
         kNamein += ".raw";
 
@@ -195 +197 @@
 
     const TString option(kUpdate ? "UPDATE" : "RECREATE");
-    if (isreport)
+    if (isreport || isdc)
     {
         MReportFileRead *r = new MReportFileRead(kNamein);
-        r->AddToList("MReportDAQ");
-        r->AddToList("MReportDrive");
-        r->AddToList("MReportCamera");
-        r->AddToList("MReportTrigger");
+        if (isdc)
+        {
+            r->SetHasNoHeader();
+            r->AddToList("MReportCurrents");
+        }
+        else
+        {
+            r->AddToList("MReportDAQ");
+            r->AddToList("MReportDrive");
+            r->AddToList("MReportCamera");
+            r->AddToList("MReportTrigger");
+        }
         read = r;
 
@@ -211 +221 @@
          w->AddContainer("MTimeDrive",         "Drive");
          */
-        w->AddContainer("MReportCamera",      "Camera");
-        w->AddContainer("MTimeCamera",        "Camera");
-        w->AddContainer("MCameraAUX",         "Camera");
-        w->AddContainer("MCameraCalibration", "Camera");
-        w->AddContainer("MCameraCooling",     "Camera");
-        w->AddContainer("MCameraHV",          "Camera");
-        w->AddContainer("MCameraLV",          "Camera");
-        w->AddContainer("MCameraLids",        "Camera");
-        w->AddContainer("MReportTrigger",     "Trigger");
-        w->AddContainer("MTimeTrigger",       "Trigger");
-        w->AddContainer("MReportDrive",       "Drive");
-        w->AddContainer("MTimeDrive",         "Drive");
+        if (isdc)
+        {
+            w->AddContainer("MTimeCurrents",   "DC");
+            w->AddContainer("MCameraDC",       "DC");
+            w->AddContainer("MReportCurrents", "DC");
+        }
+        else
+        {
+            w->AddContainer("MReportCamera",      "Camera");
+            w->AddContainer("MTimeCamera",        "Camera");
+            w->AddContainer("MCameraAUX",         "Camera");
+            w->AddContainer("MCameraCalibration", "Camera");
+            w->AddContainer("MCameraCooling",     "Camera");
+            w->AddContainer("MCameraHV",          "Camera");
+            w->AddContainer("MCameraLV",          "Camera");
+            w->AddContainer("MCameraLids",        "Camera");
+            w->AddContainer("MReportTrigger",     "Trigger");
+            w->AddContainer("MTimeTrigger",       "Trigger");
+            w->AddContainer("MReportDrive",       "Drive");
+            w->AddContainer("MTimeDrive",         "Drive");
+        }
         write = w;
     }
@@ -252 +271 @@
         return -1;
     }
+
+    tasks.PrintStatistics();
 
     gLog << all << "Merpp finished successfull!" << endl;

trunk/MagicSoft/Mars/mhist/MHVsTime.cc

@@ -61 +61 @@
 //
 MHVsTime::MHVsTime(const char *rule)
-    : fGraph(NULL), fData(NULL), fScale(1)
+    : fGraph(NULL), fData(NULL), fScale(1), fUseEventNumber(0)
 {  
     fName  = gsDefName;

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -162 +162 @@
         return kFALSE;
 
-    fRawEvtTime = (MTime*)pList->FindCreateObj("MTime", "MRawEvtTime");
+    fRawEvtTime = (MTime*)pList->FindCreateObj("MTime");
     if (!fRawEvtTime)
         return kTRUE;
@@ -241 +241 @@
         const Double_t mhz = 9.375;                        // [1e6 ticks/s]
         const Double_t t   = tm/mhz;                       // [us]
-        //cout << (ULong_t)t << endl;
         const UInt_t ns    = (UInt_t)fmod(t*1e3, 1e6);
         const UShort_t ms  = (UShort_t)fmod(t/1e3, 1e3);
@@ -256 +255 @@
                          fRawRunHeader->GetDateDay(),
                          m/60, m%60, s, ms, ns);
-
-        //cout << tm << ": ";
-        //fRawEvtTime->Print();
     }
 

trunk/MagicSoft/Mars/mreport/MReport.cc

@@ -60 +60 @@
     int n = sscanf(str.Data(),
                    fHasReportTime ?
-                   " %d %d %d %d %d %d %d %d "
-                   "%*d %*d %*d %*d %*d %*d %*d %*d %n" :
-                   " %d %*d %*d %*d %d %d %d %d ",
+                   " %d %d %d %d %d %d %d %d %*d %*d %*d %*d %*d %*d %*d %*d %n" :
+                   " %d %d %d %d %d %d %d %d %n",
                    &state, &yea, &mon, &day, &hor, &min, &sec, &ms, &len);
     if (n!=8)
     {
-        *fLog << err << "ERROR - Cannot interprete Body of " << fIdentifier << endl;
+        *fLog << err << "ERROR - Cannot interprete Body of " << fIdentifier << " (n=" << n << ")" << endl;
         return kFALSE;
     }
@@ -81 +80 @@
 
     str.Remove(0, len);
+
     return kTRUE;
 }

trunk/MagicSoft/Mars/mreport/MReportCurrents.cc

@@ -36 +36 @@
 #include "MLogManip.h"
 
-#include "MAstro.h"
+#include "MParList.h"
+#include "MCameraDC.h"
 
 ClassImp(MReportCurrents);
@@ -42 +43 @@
 using namespace std;
 
-MReportCurrents::MReportCurrents() : MReport("DC-REPORT"), fCurrents(577)
+MReportCurrents::MReportCurrents() : MReport("DC-REPORT", kFALSE)
 {
     fName  = "MReportCurrents";
     fTitle = "Class for DC-REPORT information";
 }
+
+Bool_t MReportCurrents::SetupReading(MParList &plist)
+{
+    fDC = (MCameraDC*)plist.FindCreateObj("MCameraDC");
+    if (!fDC)
+        return kFALSE;
+
+    return MReport::SetupReading(plist);
+}
+
 
 // Currents-REPORT 02 2003 11 04 23 53 34 951 00 0000 00 00 23 53 32 466
@@ -54 +65 @@
     Int_t len;
     Short_t err1, err2;
-    const Int_t n=sscanf(str.Data(), " %hd %hd %n",
-                         &err1, &err2, &len);
+    const Int_t n=sscanf(str.Data(), " %hd %hd %n", &err1, &err2, &len);
     if (n!=2)
     {
-        *fLog << err << "ERROR - Reading information of 'LV' section." << endl;
+        *fLog << err << "ERROR - Reading status information." << endl;
         return kFALSE;
     }
@@ -82 +92 @@
         }
 
-        fCurrents[i++] = 0.001*c;
+        (*fDC)[i++] = 0.001*c;
     }
 
@@ -88 +98 @@
     str=str.Strip(TString::kLeading);
 
-    return kTRUE;
+    return str.IsNull();
 }

trunk/MagicSoft/Mars/mreport/MReportCurrents.h

@@ -6 +6 @@
 #endif
 
-#ifndef ROOT_TArrayF
-#include <TArrayF.h>
-#endif
+class MCameraDC;
 
 class MReportCurrents : public MReport
@@ -16 +14 @@
     Byte_t fStatus2;
 
-    TArrayF fCurrents;
+    MCameraDC *fDC; //!
+
+    Bool_t SetupReading(MParList &plist);
+    Bool_t InterpreteBody(TString &str);
 
 public:
     MReportCurrents();
 
-    Bool_t InterpreteBody(TString &str);
-
-    ClassDef(MReportCurrents, 0) // Class for DC-REPORT information
+    ClassDef(MReportCurrents, 1) // Class for DC-REPORT information
 };
 

trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

@@ -270 +270 @@
         return kFALSE;
     }
+    if (TestBit(kHasNoHeader))
+        return kTRUE;
 
     return CheckFileHeader();
@@ -287 +289 @@
     while (!GetReport(rep))
     {
-        str.ReadLine(*fIn);
+        // Don't know the reason, but ReadLine and ReadString don't work
+        // for the (at least: converted) DC files.
+        str.ReadToDelim(*fIn);
         if (!*fIn)
         {

trunk/MagicSoft/Mars/mreport/MReportFileRead.h

@@ -27 +27 @@
     THashTable *fList;
 
+    enum { kHasNoHeader = BIT(14) };
+
     Int_t PreProcess(MParList *pList);
     Int_t Process();
@@ -40 +42 @@
     ~MReportFileRead();
 
+    void SetHasNoHeader() { SetBit(kHasNoHeader); }
+
     Bool_t AddToList(const char *name) const;
 

trunk/MagicSoft/Mars/mreport/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mtools -I../mcamera
+INCLUDES = -I. -I../mbase -I../mtools -I../mcamera -I../mgui
+# mgui - MCameraDC <MCamEvent>
 
 #------------------------------------------------------------------------------