Update master to aliroot

[u/mrichter/AliRoot.git] / HLT / MUON / AliHLTMUONMansoCandidatesBlockStruct.h

diff --git a/HLT/MUON/AliHLTMUONMansoCandidatesBlockStruct.h b/HLT/MUON/AliHLTMUONMansoCandidatesBlockStruct.h
index c843c1844ae44a6a69c5c2543cfb58dd5b09b3b3..46cdaf4b522bda40fadbd34e1f7a84bd02c5aadd 100644 (file)
--- a/HLT/MUON/AliHLTMUONMansoCandidatesBlockStruct.h
+++ b/HLT/MUON/AliHLTMUONMansoCandidatesBlockStruct.h
@@ -3,15 +3,14 @@
 /* Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-/* $Id$ */
+// $Id$
 
 /**
  * @file   AliHLTMUONMansoCandidatesBlockStruct.h
  * @author Artur Szostak <artursz@iafrica.com>
- * @date   
- * @brief  Definition of internal dimuon HLT track candidates data block
- *         structure generated by the Manso algorithm.
- * 
+ * @date   21 May 2007
+ * @brief  Definition of internal dimuon HLT track candidates data block structure generated by the Manso algorithm.
+ *
  * The structures are defined with C linkage since C generally gives us more
  * binary compatibility between compilers.
  */
@@ -46,6 +45,10 @@ struct AliHLTMUONMansoCandidateStruct
        // The regions of interest searched on the various chambers.
        // fRoI[0] is region of interest on chamber 7, fRoI[1] is on 8 etc...
        AliHLTMUONMansoRoIStruct fRoI[4];
+       
+       // The parameters used for momentum estimation:
+       AliHLTFloat32_t fZmiddle; // Z position in the middle of the magnetic field in centimetres.
+       AliHLTFloat32_t fBl; // The integrated magnetic field in (T.m) tesla metres.
 };
 
 /**
@@ -57,7 +60,7 @@ struct AliHLTMUONMansoCandidatesBlockStruct
        AliHLTMUONDataBlockHeader fHeader; // Common data block header.
 
        // Array of Manso track candidates.
-       AliHLTMUONMansoCandidateStruct fCandidate[/*fHeader.fNrecords*/];
+       //AliHLTMUONMansoCandidateStruct fCandidate[/*fHeader.fNrecords*/];
 };
 
 } // extern "C"
@@ -75,7 +78,7 @@ std::ostream& operator << (
 /**
  * Stream operator for usage with std::ostream classes which prints the track
  * candidate information in the following format:
- *  {fTrack = xx, fRoI[0] = {...}, fRoI[1] = {...}, fRoI[2] = {...}, fRoI[3] = {...}}
+ *  {fTrack = xx, fRoI[0] = {...}, fRoI[1] = {...}, fRoI[2] = {...}, fRoI[3] = {...}, fZmiddle = yy, fBl = zz}
  */
 std::ostream& operator << (
                std::ostream& stream, const AliHLTMUONMansoCandidateStruct& candidate
@@ -108,7 +111,8 @@ inline bool operator == (
 {
        return a.fTrack == b.fTrack
                and a.fRoI[0] == b.fRoI[0] and a.fRoI[1] == b.fRoI[1]
-               and a.fRoI[2] == b.fRoI[2] and a.fRoI[3] == b.fRoI[3];
+               and a.fRoI[2] == b.fRoI[2] and a.fRoI[3] == b.fRoI[3]
+               and a.fZmiddle == b.fZmiddle and a.fBl == b.fBl;
 }
 
 inline bool operator != (