Adding missing fields for number of track pairs for all pt values.

diff --git a/HLT/MUON/AliHLTMUONPairsDecisionBlockStruct.cxx b/HLT/MUON/AliHLTMUONPairsDecisionBlockStruct.cxx
index 45c3aa09b5d879bd2936baedf880b804d1bc94c1..5606956a16e1cc6ce885fbfee78e0b27f4702852 100644 (file)
--- a/HLT/MUON/AliHLTMUONPairsDecisionBlockStruct.cxx
+++ b/HLT/MUON/AliHLTMUONPairsDecisionBlockStruct.cxx
@@ -35,8 +35,10 @@ std::ostream& operator << (
        assert( AliHLTMUONUtils::IntegrityOk(block) );
 
        stream  << "{fHeader = " << block.fHeader
+               << ", fNunlikeAnyPt = " << block.fNunlikeAnyPt
                << ", fNunlikeLowPt = " << block.fNunlikeLowPt
                << ", fNunlikeHighPt = " << block.fNunlikeHighPt
+               << ", fNlikeAnyPt = " << block.fNlikeAnyPt
                << ", fNlikeLowPt = " << block.fNlikeLowPt
                << ", fNlikeHighPt = " << block.fNlikeHighPt
                << ", fNmassAny = " << block.fNmassAny
@@ -63,8 +65,10 @@ bool operator == (
        // check if every track pair's decision is the same. In either case if
        // we find a difference return false.
        if (a.fHeader != b.fHeader) return false;
+       if (a.fNunlikeAnyPt != b.fNunlikeAnyPt) return false;
        if (a.fNunlikeLowPt != b.fNunlikeLowPt) return false;
        if (a.fNunlikeHighPt != b.fNunlikeHighPt) return false;
+       if (a.fNlikeAnyPt != b.fNlikeAnyPt) return false;
        if (a.fNlikeLowPt != b.fNlikeLowPt) return false;
        if (a.fNlikeHighPt != b.fNlikeHighPt) return false;
        if (a.fNmassAny != b.fNmassAny) return false;

diff --git a/HLT/MUON/AliHLTMUONPairsDecisionBlockStruct.h b/HLT/MUON/AliHLTMUONPairsDecisionBlockStruct.h
index b3c3d1b1eed0b30d64801213fa9789e292be1f77..ee38800ed11e75bc3dd8bc4b61c701094045b35e 100644 (file)
--- a/HLT/MUON/AliHLTMUONPairsDecisionBlockStruct.h
+++ b/HLT/MUON/AliHLTMUONPairsDecisionBlockStruct.h
@@ -56,6 +56,9 @@ struct AliHLTMUONPairsDecisionBlockStruct
 {
        AliHLTMUONDataBlockHeader fHeader; // Common data block header.
        
+       // Number of unlike sign pt triggers for both tracks having any pt.
+       AliHLTUInt32_t fNunlikeAnyPt;
+       
        // Number of unlike sign low pt triggers where both tracks have
        // pt > low cut.
        AliHLTUInt32_t fNunlikeLowPt;
@@ -64,6 +67,9 @@ struct AliHLTMUONPairsDecisionBlockStruct
        // pt > high cut.
        AliHLTUInt32_t fNunlikeHighPt;
        
+       // Number of like sign pt triggers where both tracks have any pt.
+       AliHLTUInt32_t fNlikeAnyPt;
+       
        // Number of like sign low pt triggers where both tracks have
        // pt > low cut.
        AliHLTUInt32_t fNlikeLowPt;
@@ -94,7 +100,7 @@ struct AliHLTMUONPairsDecisionBlockStruct
 /**
  * Stream operator for usage with std::ostream classes which prints the
  * trigger decision information for pairs of tracks in the following format:
- *  {fTrackAId = xx, fTrackBId = yy, fTriggerBits = 0xZZ}
+ *  {fTrackAId = xx, fTrackBId = yy, fTriggerBits = 0xZZ, fInvMass = ww}
  */
 inline std::ostream& operator << (
                std::ostream& stream, const AliHLTMUONPairDecisionStruct& trig
@@ -103,7 +109,7 @@ inline std::ostream& operator << (
        stream  << "{fTrackAId = " << trig.fTrackAId
                << ", fTrackBId = " << trig.fTrackBId << ", fTriggerBits = "
                << std::showbase << std::hex << trig.fTriggerBits << std::dec
-               << "}";
+               << ", fInvMass = " << trig.fInvMass << "}";
        return stream;
 }
 
@@ -126,6 +132,7 @@ inline bool operator == (
        )
 {
        return a.fTrackAId == b.fTrackAId and a.fTrackBId == b.fTrackBId
+               and a.fTriggerBits == b.fTriggerBits
                and a.fTriggerBits == b.fTriggerBits;
 }