Changeset 9178


Ignore:
Timestamp:
Nov 27, 2008, 11:41:12 AM (12 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r9177 r9178  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2008/11/27 Thomas Bretz
     22
     23   * mbase/MContinue.[h,cc]:
     24     - updated ClassVersion number according to last change
     25
     26   * mraw/MRawFilesRead.cc:
     27     - fixed a bug when errno==0
     28
     29   * mjobs/MJStar.cc:
     30     - in case of sum trigger skip only events with only sum-trigger not
     31       all events with sum-trigger for effective on time calculation
     32
     33
    2034
    2135 2008/11/24 Daniela Dorner
  • trunk/MagicSoft/Mars/NEWS

    r9168 r9178  
    7070     the ratio with which pedestal events or events with signals
    7171     are contained in the data.
     72
     73 ;star
     74
     75   * For the calculation of the effective on time all sum-triggered events
     76     were skipped. Now all Level1-triggeres events will pass. This might
     77     result in a slight inaccuracy of the effective on time.
    7278
    7379 ;ganymed
  • trunk/MagicSoft/Mars/mbase/MContinue.cc

    r9157 r9178  
    3333// To invert the meaning of the contained filter call SetInverted()
    3434//
     35//
    3536//  Input Containers:
    3637//   -/-
     
    3839//  Output Containers:
    3940//   -/-
     41//
     42//
     43// Class Version 2:
     44// ----------------
     45//  + Int_t fRc;
    4046//
    4147/////////////////////////////////////////////////////////////////////////////
  • trunk/MagicSoft/Mars/mbase/MContinue.h

    r9157 r9178  
    2525    MTaskList *fTaskList;  //! pointer to the present tasklist
    2626
    27     Int_t fRc;
     27    Int_t fRc;             // Return code returned in Process()
    2828
    2929    // MTask
     
    5757    void Print(Option_t *o="") const; //*MENU*
    5858
    59     ClassDef(MContinue, 1) //Task returning kCONTINUE
     59    ClassDef(MContinue, 2) //Task returning kCONTINUE
    6060};
    6161
  • trunk/MagicSoft/Mars/mjobs/MJStar.cc

    r9157 r9178  
    270270    MFTriggerPattern fsum;
    271271    fsum.SetDefault(kTRUE);
    272     fsum.DenySumTrigger();
    273     fsum.AllowTriggerLvl1();
    274     //fsum.RequireTriggerLvl1();
     272    fsum.DenyAll();
     273    fsum.RequireTriggerLvl1();
     274    fsum.AllowTriggerLvl2();
     275    fsum.AllowSumTrigger();
    275276    fill9.SetFilter(&fsum);
    276277
  • trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

    r8352 r9178  
    194194    {
    195195        *fLog << err << "Cannot open file " << expname << ": ";
    196         *fLog << (errno==0?strerror(errno):"Insufficient memory for decompression") << endl;
     196        *fLog << (errno!=0?strerror(errno):"Insufficient memory for decompression") << endl;
    197197    }
    198198    else
Note: See TracChangeset for help on using the changeset viewer.