Changeset 9178

Timestamp:

11/27/08 11:41:12 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mbase/MContinue.cc (modified) (2 diffs)
• mbase/MContinue.h (modified) (2 diffs)
• mjobs/MJStar.cc (modified) (1 diff)
• mraw/MRawFileRead.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/11/27 Thomas Bretz
+
+   * mbase/MContinue.[h,cc]:
+     - updated ClassVersion number according to last change
+
+   * mraw/MRawFilesRead.cc:
+     - fixed a bug when errno==0
+
+   * mjobs/MJStar.cc:
+     - in case of sum trigger skip only events with only sum-trigger not
+       all events with sum-trigger for effective on time calculation
+
+
 
  2008/11/24 Daniela Dorner

trunk/MagicSoft/Mars/NEWS

@@ -70 +70 @@
      the ratio with which pedestal events or events with signals
      are contained in the data.
+
+ ;star
+
+   * For the calculation of the effective on time all sum-triggered events
+     were skipped. Now all Level1-triggeres events will pass. This might
+     result in a slight inaccuracy of the effective on time.
 
  ;ganymed

trunk/MagicSoft/Mars/mbase/MContinue.cc

@@ -33 +33 @@
 // To invert the meaning of the contained filter call SetInverted()
 //
+//
 //  Input Containers:
 //   -/-
@@ -38 +39 @@
 //  Output Containers:
 //   -/-
+//
+//
+// Class Version 2:
+// ----------------
+//  + Int_t fRc;
 //
 /////////////////////////////////////////////////////////////////////////////

trunk/MagicSoft/Mars/mbase/MContinue.h

@@ -25 +25 @@
     MTaskList *fTaskList;  //! pointer to the present tasklist
 
-    Int_t fRc;
+    Int_t fRc;             // Return code returned in Process()
 
     // MTask
@@ -57 +57 @@
     void Print(Option_t *o="") const; //*MENU*
 
-    ClassDef(MContinue, 1) //Task returning kCONTINUE
+    ClassDef(MContinue, 2) //Task returning kCONTINUE
 };
 

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -270 +270 @@
     MFTriggerPattern fsum;
     fsum.SetDefault(kTRUE);
-    fsum.DenySumTrigger();
-    fsum.AllowTriggerLvl1();
-    //fsum.RequireTriggerLvl1();
+    fsum.DenyAll();
+    fsum.RequireTriggerLvl1();
+    fsum.AllowTriggerLvl2();
+    fsum.AllowSumTrigger();
     fill9.SetFilter(&fsum);
 

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -194 +194 @@
     {
         *fLog << err << "Cannot open file " << expname << ": ";
-        *fLog << (errno==0?strerror(errno):"Insufficient memory for decompression") << endl;
+        *fLog << (errno!=0?strerror(errno):"Insufficient memory for decompression") << endl;
     }
     else