--- PamCut/MiscCuts/DataQualCut/DataQualCut.cpp 2009/05/27 13:30:09 1.1.1.1 +++ PamCut/MiscCuts/DataQualCut/DataQualCut.cpp 2010/03/09 18:02:10 1.2 @@ -2,7 +2,7 @@ * DataQualCut.cpp * * Created on: 10-mar-2009 - * Author: Sergio Ricciarini, Nicola Mori + * Author: S. Ricciarini */ /*! @file DataQualCut.cpp The DataQualCut class implementation file */ @@ -61,34 +61,46 @@ } //cout << "TOF "; - // ++++++++++ AC ++++++++++ - if ((_cutMask & AC) == AC) { + // ++++++++++ ANT ++++++++++ + if ((_cutMask & ANT) == ANT) { if (event->GetAcLevel2()) { if (event->GetAcLevel2()->unpackError || ((event->GetAcLevel2()->status[0] >> 2) & 1) || ((event->GetAcLevel2()->status[1] >> 2) & 1)) { - return AC; + return ANT; } } else { - return AC; + return ANT; } } - //cout << "AC "; + //cout << "ANT "; - // ++++++++++ TRIG ++++++++++ - if ((_cutMask & TRIG) == TRIG) { + // ++++++++++ TRG ++++++++++ + if ((_cutMask & TRG) == TRG) { if (event->GetTrigLevel2()) { if (event->GetTrigLevel2()->unpackError) { - return TRIG; + return TRG; } } else { - return TRIG; + return TRG; } } - //cout << "TRIG "; + //cout << "TRG "; + + // ++++++++++ ND ++++++++++ + if ((_cutMask & ND) == ND) { + if (event->GetNDLevel2()) { + if (event->GetNDLevel2()->unpackError) { + return ND; + } + } + else { + return ND; + } + } + //cout << "ND "; - //TODO: vedere se si puo' controllare anche l'unpack error per ORB (sembra di no...) // ++++++++++ ORB ++++++++++ if ((_cutMask & ORB) == ORB) { if (!event->GetOrbitalInfo()) {