Commits

Sebastien Binet  committed 7108ebf Merge

sync w/ atlasoff

  • Participants
  • Parent commits a44b5bc, 832aefd
  • Branches waffle-repo, mob

Comments (0)

Files changed (4)

 be243ad0f8c6cd9136f28bec8ddaac41b2ae6582 EventInfo-00-09-01
 3a9c9a11d99accf96c17930241234376371072d3 EventInfo-00-09-02
 35c539331717297fad5dd4357ceb6b79c712ef5f EventInfo-00-09-03
+9c1362acc618bf8d88ff64abe6b6e356a7bbe3ba EventInfo-00-09-04
+cccd4d9ffe214227865f9f7b6c61210603fc43fe EventInfo-00-09-05
+834515bd11d44c4ce51827580512f7a5572627e1 EventInfo-00-09-06
+2012-02-13 Joăo Firmino da Costa <joao.costa@cern.ch>
+
+	* tagging EventInfo-00-09-06
+	* M EventInfo/EventInfo.h, Background word changes
+
+2012-01-30  Joe Tuggle  <jtuggle@uchicago.edu>
+
+	* tagging EventInfo-00-09-05
+	* Fix D3PD making in release 17.1.X with SG_ADD_BASE (PileUpEventInfo, EventInfo)
+	* M EventInfo/PileUpEventInfo.h
+
 2011-10-07  Sebastien Binet  <binet@voatlas51.cern.ch>
 
 	* tagging EventInfo-00-09-04

File EventInfo/EventInfo.h

 
     /// \name enum for bits in Background EventFlag word
     //@{
-    enum BackgroundEventFlag { MBTSTimeDiffHalo, MBTSTimeDiffCol, 
-			       LArECTimeDiffHalo, LArECTimeDiffCol,
-			       PixMultiplicityHuge, PixSPNonEmpty,
+
+
+    enum BackgroundEventFlag { MBTSTimeDiffHalo, MBTSTimeDiffCol,
+                               LArECTimeDiffHalo, LArECTimeDiffCol,
+                               PixMultiplicityHuge, PixSPNonEmpty,
                                SCTMultiplicityHuge, SCTSPNonEmpty,
-			       CSCTimeDiffHalo, CSCTimeDiffCol,
-			       BCMTimeDiffHalo, BCMTimeDiffCol,
-			       MuonTimingCol, MuonTimingCosmic,
-			       MBTSBeamVeto,
-			       BCMBeamVeto,
-			       LUCIDBeamVeto,
-			       NBackgroundWords
+                               CSCTimeDiffHalo, CSCTimeDiffCol,
+                               BCMTimeDiffHalo, BCMTimeDiffCol,
+                               MuonTimingCol, MuonTimingCosmic,
+                               MBTSBeamVeto,
+                               BCMBeamVeto,
+                               LUCIDBeamVeto,
+                               HaloMuonSegment, HaloClusterShape,
+                               HaloMuonOneSided, HaloMuonTwoSided,
+                               HaloTileClusterPattern,
+                               BeamGasPixel,
+                               CosmicStandAlone, CosmicStandAloneTight,
+                               CosmicCombined, CosmicCombinedTight,
+                               BkgdResvBit1, BkgdResvBit2,
+                               BkgdResvBit3, BkgdResvBit4,
+                               BkgdResvBit5,
+                               NBackgroundWords
     };
     //@}
 

File EventInfo/PileUpEventInfo.h

 #endif
 CLASS_DEF( PileUpEventInfo , 2102 , 1 )
 
+#include "SGTools/BaseInfo.h"
+SG_ADD_BASE (PileUpEventInfo, EventInfo);
+
 #endif // EVENTINFO_PILEUPEVENTINFO_H