Changeset 3817

Timestamp:

04/23/04 09:29:51 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/Makefile (modified) (4 diffs)
• mreport/MReportRun.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/04/23: Thomas Bretz
+
+  * */Makefile:
+    - added some more mpedestal
+
+  * mreport/MReportRun.cc:
+    - changed to work with the latest version of report-files
+      --> This will make it incompatible with older report files
+          (for this use older Mars versions for merpping)
+
+
+
  2004/04/22: Nadia Tonello
 

trunk/MagicSoft/Mars/mfileio/Makefile

@@ -21 +21 @@
 
 INCLUDES = -I. -I../mbase -I../mraw -I../mmc -I../mreflector -I../mgui \
-           -I../mdata -I../manalysis -I../mgeom -I../mhbase -I../mpointing
+           -I../mdata -I../manalysis -I../mgeom -I../mhbase            \
+           -I../mpointing -I../mpedestal
 #mraw:       MRawRunHeader (MReadMaraFile)
 #mmc:        MMcRunHeader  (MReadMarsFile)
@@ -31 +32 @@
 #mhbase:     MBinning      (MCT1ReadPreProc)
 #mpointing:  MPointingPos  (MCT1ReadPreProc)
+#mpedestal:  MPedestalCam  (MCT1ReadAscii)
 
 # @code 
@@ -42 +44 @@
 
 SRCFILES = MRead.cc \
+           MReadFiles.cc \
            MChain.cc \
            MReadTree.cc \
@@ -51 +54 @@
            MWriteRootFile.cc \
            MCT1ReadAscii.cc \
-           MCT1ReadPreProc.cc
+           MCT1ReadPreProc.cc \
+           MCheckMagicFile.cc
 
 SRCS    = $(SRCFILES)

trunk/MagicSoft/Mars/mreport/MReportRun.cc

@@ -59 +59 @@
 Int_t MReportRun::InterpreteBody(TString &str)
 {
-    Int_t len;
-    const Int_t n=sscanf(str.Data(), "%d %n", &fRunNumber, &len);
+    const Int_t pos = str.First(' ');
+    if (pos<0)
+    {
+        *fLog << warn << "WARNING - Token not found." << endl;
+        return kCONTINUE;
+    }
+    const TString tok=str(0, pos);
+
+    str.Remove(0, pos);
+    str = str.Strip(TString::kBoth);
+
+    Int_t len, run;
+    const Int_t n=sscanf(str.Data(), "%d %n", &run, &len);
     if (n!=1)
     {
@@ -68 +79 @@
     str.Remove(0, len);
 
-    if (str.BeginsWith("END"))
+    if (tok=="START")
+    {
+        if (fRunNumber!=-1)
+            *fLog << warn << "WARNING - RUN-REPORT STOP missing." << endl;
+        fRunNumber = run;
+    }
+    if (tok=="STOP")
+    {
+        if (fRunNumber==-1)
+            *fLog << warn << "WARNING - RUN-REPORT START missing." << endl;
         fRunNumber = -1;
+    }
 
-    str.Remove(0, 6);
-    str = str.Strip(TString::kBoth);
     Ssiz_t pos = str.First(' ');
     if (pos<0)