Changeset 9480 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
07/28/09 14:37:25 (15 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r9474 r9480  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2009/07/28 Thomas Bretz
     22
     23   * mjobs/MJCalibration.cc:
     24     - we have to allow all kind of triggers together with a
     25       calibration trigger, otherwise we never have enough
     26       calibration events if the trigger signals haven't been
     27       switched off (prescaled)
     28
     29   * mtrigger/MTriggerPatternDecode.cc:
     30     - when we move L1TPU to L1 as a workaround we now really "move"
     31       the bit instead of just copy it (this is better for filters
     32       like "deny all")
     33
     34
    2035
    2136 2009/07/04 Daniela Dorner
  • trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

    r9473 r9480  
    14011401    MFTriggerPattern          fcalib("CalibFilter");
    14021402    fcalib.SetDefault(kFALSE);
    1403     fcalib.AllowAll(MFTriggerPattern::kPrescaled);
    1404     fcalib.AllowAll(MFTriggerPattern::kUnPrescaled);
    1405     fcalib.DenyTriggerLvl1(MFTriggerPattern::kUnPrescaled);
    1406     fcalib.DenyTriggerLvl1(MFTriggerPattern::kPrescaled);
    1407     fcalib.DenyTriggerLvl2(MFTriggerPattern::kUnPrescaled);
    1408     fcalib.DenyTriggerLvl2(MFTriggerPattern::kPrescaled);
    1409     fcalib.DenySumTrigger(MFTriggerPattern::kUnPrescaled);
    1410     fcalib.DenySumTrigger(MFTriggerPattern::kPrescaled);
     1403    fcalib.DenyAll(MFTriggerPattern::kPrescaled);
     1404    fcalib.DenyAll(MFTriggerPattern::kUnPrescaled);
     1405    fcalib.AllowTriggerLvl1(MFTriggerPattern::kUnPrescaled);
     1406    fcalib.AllowTriggerLvl1(MFTriggerPattern::kPrescaled);
     1407    fcalib.AllowTriggerLvl2(MFTriggerPattern::kUnPrescaled);
     1408    fcalib.AllowTriggerLvl2(MFTriggerPattern::kPrescaled);
     1409    fcalib.AllowSumTrigger(MFTriggerPattern::kUnPrescaled);
     1410    fcalib.AllowSumTrigger(MFTriggerPattern::kPrescaled);
    14111411    fcalib.RequireCalibration(MFTriggerPattern::kPrescaled);
    14121412    fcalib.RequireCalibration(MFTriggerPattern::kUnPrescaled);
  • trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.cc

    r9462 r9480  
    133133    fPattern->fUnprescaled = (pattern>>8) & 0xff;
    134134
     135    cout << (int)((pattern>>6)&1) << " " << fPattern->fPrescaled << endl;
     136
     137    fPattern->Print();
     138
    135139    // This is a workaround for the new scheme in which L1TPU (the signal
    136140    // comming directly from the L1 is connected, but the L1 (routed
     
    141145        fPattern->fPrescaled   |= (pattern>> 6)&1;
    142146        fPattern->fUnprescaled |= (pattern>>14)&1;
     147
     148        fPattern->fPrescaled   &= 0xbf;
     149        fPattern->fUnprescaled &= 0xbf;
    143150    }
     151
     152    fPattern->Print();
    144153
    145154    return kTRUE;
Note: See TracChangeset for help on using the changeset viewer.