Changeset 8787 for trunk


Ignore:
Timestamp:
12/13/07 14:19:38 (17 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
1 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8786 r8787  
    3737   * mtrigger/MTriggerPattern.[h,cc]:
    3838     - a new bit implemented for the sum-trigger
     39
     40   * datacenter/compmux:
     41     - removed this BINARY. There is no way and it doesn't make any sense
     42       (except in a few exceptional cases) to put binaries into the cvs
    3943
    4044

  • trunk/MagicSoft/Mars/NEWS

    r8780 r8787  
    2424* Sequence files now allow for excluding runs from the analysis
    2525(for more details see Class reference of MSequence)
     26* added code to process the sum-trigger flag
     27
     28;callisto
     29* in the pedestal processing now at least 50 processed events are
     30required for succeeding.
     31
    2632;ganymed/sponde
    2733* Now data points are even shown correctly if they have error bars larger
    2834than one sigma. Points with null or negative significances are omitted.
     35
    2936;sponde
    3037*fixed resource files ('''Spectrum''' instead of '''MJSpectrum''')

  • trunk/MagicSoft/Mars/callisto.rc

    r8582 r8787  
    287287#MJPedestalY2.UseData: Yes
    288288#MJPedestalY3.UseData: Yes
     289#MJPedestalY1.MinEvents: 50
     290#MJPedestalY2.MinEvents: 50
     291#MJPedestalY3.MinEvents: 50
    289292MJPedestalY1.MaxEvents: 500
    290293MJPedestalY2.MaxEvents: 5000

  • trunk/MagicSoft/Mars/callisto_Dec04Jan05.rc

    r8582 r8787  
    316316#MJPedestalY2.UseData: Yes
    317317#MJPedestalY3.UseData: Yes
     318#MJPedestalY1.MinEvents: 50
     319#MJPedestalY2.MinEvents: 50
     320#MJPedestalY3.MinEvents: 50
    318321MJPedestalY1.MaxEvents: 500
    319322MJPedestalY2.MaxEvents: 5000

  • trunk/MagicSoft/Mars/callisto_mux.rc

    r8585 r8787  
    312312#MJPedestalY2.UseData: Yes
    313313#MJPedestalY3.UseData: Yes
     314#MJPedestalY1.MinEvents: 50
     315#MJPedestalY2.MinEvents: 50
     316#MJPedestalY3.MinEvents: 50
    314317MJPedestalY1.MaxEvents:  3500
    315318MJPedestalY2.MaxEvents: 30000

  • trunk/MagicSoft/Mars/mhflux/MHAlpha.cc

    r8780 r8787  
    121121    fHTheta.SetDirectory(NULL);
    122122    fHTheta.UseCurrentStyle();
     123    fHTheta.SetMinimum(0);
    123124
    124125    // effective on time versus time
    … …  
    133134    fHTime.GetXaxis()->SetTimeFormat("%H:%M:%S %F1995-01-01 00:00:00 GMT");
    134135    fHTime.GetXaxis()->SetTimeDisplay(1);
     136    fHTime.SetMinimum(0);
    135137    fHTime.Sumw2();
    136138

  • trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

    r8582 r8787  
    1919!   Author(s): Markus Gaug, 4/2004 <mailto:markus@ifae.es>
    2020!
    21 !   Copyright: MAGIC Software Development, 2000-2005
     21!   Copyright: MAGIC Software Development, 2000-2007
    2222!
    2323!
    … …  
    2929//
    3030// Resource file entries are case sensitive!
     31//
     32// We require at least fMinEvents (def=50) to be processed by the
     33// ExtractPedestal-task. If not an error is returned.
    3134//
    3235/////////////////////////////////////////////////////////////////////////////
    … …  
    118121    : fExtractor(NULL), fDisplayType(kDisplayDataCheck),
    119122    fExtractType(kUsePedRun), fExtractionType(kFundamental),
    120     fIsUseHists(kFALSE), fDeadPixelCheck(kFALSE)
     123    fIsUseHists(kFALSE), fDeadPixelCheck(kFALSE), fMinEvents(50)
    121124{
    122125    fName  = name  ? name  : "MJPedestal";
    … …  
    761764    SetExtractWinRight(GetEnv("ExtractWinRight", fExtractWinRight));
    762765
     766    SetMinEvents(GetEnv("MinEvents", (Int_t)fMinEvents));
     767
    763768    if (!MJCalib::CheckEnvLocal())
    764769        return kFALSE;
    … …  
    12521257    }
    12531258
     1259    if (taskenv.GetNumExecutions()<fMinEvents)
     1260    {
     1261        *fLog << err << GetDescriptor() << ": Failed. Less than the required " << fMinEvents << " evts processed." << endl;
     1262        return kFALSE;
     1263    }
     1264
    12541265    if (fDeadPixelCheck)
    12551266    {

  • trunk/MagicSoft/Mars/mjobs/MJPedestal.h

    r8518 r8787  
    5151    Float_t fExtractWinLeft;                 //  Number of FADC slices to extract leftward from mean pulse pos. 
    5252    Float_t fExtractWinRight;                //  Number of FADC slices to extract rightward from mean pulse pos.
    53    
     53
    5454    TString fReferenceFile;                  // File name containing the reference values
    5555    TString fBadPixelsFile;                  // File name containing the bad pixels excluded beforehand
    56    
     56
    5757    MExtractor *fExtractor;                  // Signal extractor, used to find the nr. of used FADC slices
    5858
    … …  
    7373    Bool_t fIsUseHists;                      // Switch on histogramming or not
    7474    Bool_t fDeadPixelCheck;                  // Should the dead pixel check be done?
     75
     76    UInt_t  fMinEvents;                      // Minimum number of events
    7577
    7678    MExtractor *ReadCalibration();
    … …  
    9395
    9496    Bool_t WriteExtractor() const;
    95    
     97
    9698public:
    9799    MJPedestal(const char *name=NULL, const char *title=NULL);
    … …  
    128130    void SetExtractWinRight( const Float_t f=fgExtractWinRight ) { fExtractWinRight = f; }   
    129131
     132    void SetMinEvents(UInt_t min) { fMinEvents = min; }
     133
    130134    MExtractor *GetExtractor() const { return fExtractor; }
    131135

  • trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.cc

    r7170 r8787  
    1919!   Author(s): Thomas Bretz  12/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
    2020!
    21 !   Copyright: MAGIC Software Development, 2004
     21!   Copyright: MAGIC Software Development, 2004-2007
    2222!
    2323\* ======================================================================== */
    … …  
    135135}
    136136
     137void MFTriggerPattern::RequireSumTrigger(Prescale_t prescaled)
     138{
     139    prescaled==kPrescaled ? (fMaskRequiredPrescaled |= MTriggerPattern::kSumTrigger)  : (fMaskRequiredUnprescaled |= MTriggerPattern::kSumTrigger);
     140}
     141
    137142
    138143void MFTriggerPattern::DenyTriggerLvl1(Prescale_t prescaled)
    … …  
    159164{
    160165    prescaled==kPrescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kPinDiode)    : (fMaskDeniedUnprescaled |= MTriggerPattern::kPinDiode);
     166}
     167
     168void MFTriggerPattern::DenySumTrigger(Prescale_t prescaled)
     169{
     170    prescaled==kPrescaled ? (fMaskDeniedPrescaled |= MTriggerPattern::kSumTrigger)  : (fMaskDeniedUnprescaled |= MTriggerPattern::kSumTrigger);
    161171}
    162172
    … …  
    222232//           "PED"  : Pedestal flag
    223233//           "PIND" : Pin Diode flag
     234//           "SUMT" : Sum Trigger flag
    224235//
    225236// concatenations of these strings are allowed and considered as
    … …  
    246257    if (patt.Contains("PIND", TString::kIgnoreCase))
    247258        RequirePinDiode(prescaled);
     259
     260    if (patt.Contains("SUMT", TString::kIgnoreCase))
     261        RequireSumTrigger(prescaled);
    248262}
    249263
    … …  
    261275//           "PED"  : Pedestal flag
    262276//           "PIND" : Pin Diode flag
     277//           "SUMT" : Sum Trigger flag
    263278//
    264279// concatenations of these strings are allowed and considered as
    … …  
    285300    if (patt.Contains("PIND", TString::kIgnoreCase))
    286301        DenyPinDiode(prescaled);
     302
     303    if (patt.Contains("SUMT", TString::kIgnoreCase))
     304        DenySumTrigger(prescaled);
    287305}
    288306

  • trunk/MagicSoft/Mars/mtrigger/MFTriggerPattern.h

    r6968 r8787  
    1818private:
    1919  MTriggerPattern *fPattern;        //!
    20  
     20
    2121  Byte_t fMaskRequiredPrescaled;    // Mask for filtering Trigger Pattern allowed
    2222  Byte_t fMaskRequiredUnprescaled;  // Mask for filtering Trigger Pattern allowed
    … …  
    2626  Bool_t fDefault;                  // Default which is used if trigger pattern has default value (p==0&&u==0)
    2727  Bool_t fResult;                   //!
    28  
     28
    2929  Int_t PreProcess(MParList *pList);
    3030  Int_t Process();
    31  
     31
    3232  Bool_t IsExpressionTrue() const;
    33  
     33
    3434public:
    3535  MFTriggerPattern(const char *name=NULL, const char *title=NULL);
    3636  MFTriggerPattern(MFTriggerPattern &trigpatt);
    37    
     37
    3838  void RequireTriggerLvl1(Prescale_t prescaled=kUnPrescaled);
    3939  void RequireTriggerLvl2(Prescale_t prescaled=kUnPrescaled);
    … …  
    4141  void RequirePedestal(Prescale_t prescaled=kUnPrescaled);
    4242  void RequirePinDiode(Prescale_t prescaled=kUnPrescaled);
    43  
     43  void RequireSumTrigger(Prescale_t prescaled=kUnPrescaled);
     44
    4445  void DenyTriggerLvl1(Prescale_t prescaled=kUnPrescaled);
    4546  void DenyTriggerLvl2(Prescale_t prescaled=kUnPrescaled);
    … …  
    4748  void DenyPedestal(Prescale_t prescaled=kUnPrescaled);
    4849  void DenyPinDiode(Prescale_t prescaled=kUnPrescaled);
    49  
     50  void DenySumTrigger(Prescale_t prescaled=kUnPrescaled);
     51
    5052  void Require(TString patt, Prescale_t prescaled=kUnPrescaled);
    5153  void Deny(TString patt, Prescale_t prescaled=kUnPrescaled);
    … …  
    5658  void SetMaskRequired(const Byte_t mask, Prescale_t prescaled=kUnPrescaled);
    5759  void SetMaskDenied(const Byte_t mask, Prescale_t prescaled=kUnPrescaled);
    58  
     60
    5961  ClassDef(MFTriggerPattern, 1) // A Filter for the Trigger Pattern
    6062};
    61    
     63
    6264#endif

  • trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.cc

    r7170 r8787  
    1919!   Author(s): Thomas Bretz  12/2004 <mailto:nicola.galante@pi.infn.it>
    2020!
    21 !   Copyright: MAGIC Software Development, 2004
     21!   Copyright: MAGIC Software Development, 2004-2007
    2222!
    2323\* ======================================================================== */
    … …  
    6767// BIT(3):  prescaled Pedestal Trigger
    6868// BIT(4):  prescaled Pin Diode
    69 // BIT(5):  unused
     69// BIT(5):  prescaled Sum Trigger
    7070// BIT(6):  unused
    7171// BIT(7):  unused
    … …  
    7575// BIT(11): unprescaled Pedestal Trigger
    7676// BIT(12): unprescaled Pin Diode
    77 // BIT(13): unused
     77// BIT(13): unprescaled Sum Trigger
    7878// BIT(14): unused
    7979// BIT(15): unused

  • trunk/MagicSoft/Mars/mtrigger/MTriggerPattern.h

    r5867 r8787  
    1616        kTriggerLvl2 = BIT(2), // LUT Pseudo Size selection
    1717        kPedestal    = BIT(3),
    18         kPinDiode    = BIT(4)
    19         //kUnused      = BIT(5)
     18        kPinDiode    = BIT(4),
     19        kSumTrigger  = BIT(5)  // Flag for an event taken with sum trigger
    2020        //kUnused      = BIT(6)
    2121        //kUnused      = BIT(7)
Note: See TracChangeset for help on using the changeset viewer.