update EMCal EP v2

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

diff --git a/HLT/MUON/AliHLTMUONChannelsBlockStruct.h b/HLT/MUON/AliHLTMUONChannelsBlockStruct.h
index 3777daa68b803853801b031226fc94ad589b0ef5..eaba97165e6651988575d7c12848066ddd3aedfc 100644 (file)
--- a/HLT/MUON/AliHLTMUONChannelsBlockStruct.h
+++ b/HLT/MUON/AliHLTMUONChannelsBlockStruct.h
@@ -1,21 +1,19 @@
-#ifndef ALIHLTMUONRECHITSDEBUGBLOCKSTRUCT_H
-#define ALIHLTMUONRECHITSDEBUGBLOCKSTRUCT_H
+#ifndef ALIHLTMUONCHANNELSBLOCKSTRUCT_H
+#define ALIHLTMUONCHANNELSBLOCKSTRUCT_H
 /* Copyright(c) 1998-2007, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-/* $Id$ */
+// $Id$
 
-/**
- * @file   AliHLTMUONChannelsBlockStruct.h
- * @author Artur Szostak <artursz@iafrica.com>
- * @date   
- * @brief  Definition of internal dimuon HLT block structure containing
- *         debugging information about channels that belong to reconstructed
- *         hit clusters.
- * 
- * The structures are defined with C linkage since C generally gives us more
- * binary compatibility between compilers.
- */
+///
+/// @file   AliHLTMUONChannelsBlockStruct.h
+/// @author Artur Szostak <artursz@iafrica.com>
+/// @date   18 May 2007
+/// @brief  Definition of internal dHLT channels block structure corresponding to clusters.
+///
+/// The structures are defined with C linkage since C generally gives us more
+/// binary compatibility between compilers.
+///
 
 #include "AliHLTMUONDataTypes.h"
 #include <ostream>
@@ -29,9 +27,10 @@ extern "C"
  */
 struct AliHLTMUONChannelStruct
 {
-       AliHLTUInt32_t fClusterId;   // ID corresponding to the cluster this
-                                    // channel is part of.
+       AliHLTInt32_t fClusterId;   // ID corresponding to the cluster this
+                                   // channel is part of. -1 == invalid.
 
+       AliHLTUInt16_t fBusPatch;    // Bus patch to which this is connected.
        AliHLTUInt16_t fManu;        // The MANU address on electronics.
        AliHLTUInt16_t fChannelAddress; // The channel address on electronics.
        AliHLTUInt16_t fSignal;      // ADC value of signal.
@@ -46,8 +45,8 @@ struct AliHLTMUONChannelsBlockStruct
 {
        AliHLTMUONDataBlockHeader fHeader; // Common data block header
 
-       // Array of trigger records.
-       AliHLTMUONChannelStruct fChannel[/*fHeader.fNrecords*/];
+       // Array of cluster channels/pads.
+       //AliHLTMUONChannelStruct fChannel[/*fHeader.fNrecords*/];
 };
 
 } // extern "C"
@@ -56,7 +55,7 @@ struct AliHLTMUONChannelsBlockStruct
 /**
  * Stream operator for usage with std::ostream classes which prints the
  * AliHLTMUONChannelStruct in the following format:
- *   {fClusterId = xx, fManu = yy, fChannelAddress = zz, fSignal = ww,
+ *   {fClusterId = xx, fBusPatch = yy, fManu = zz, fChannelAddress = uu, fSignal = ww,
  *    fRawDataWord = 0xXXXXXXXX}
  */
 std::ostream& operator << (
@@ -78,8 +77,8 @@ inline bool operator == (
                const AliHLTMUONChannelStruct& b
        )
 {
-       return a.fClusterId == b.fClusterId and a.fManu == b.fManu and
-               a.fChannelAddress == b.fChannelAddress and
+       return a.fClusterId == b.fClusterId and a.fBusPatch == b.fBusPatch and
+               a.fManu == b.fManu and a.fChannelAddress == b.fChannelAddress and
                a.fSignal == b.fSignal and a.fRawDataWord == b.fRawDataWord;
 }
 
@@ -105,4 +104,4 @@ inline bool operator != (
        return not operator == (a, b);
 }
 
-#endif // ALIHLTMUONRECHITSDEBUGBLOCKSTRUCT_H
+#endif // ALIHLTMUONCHANNELSBLOCKSTRUCT_H