Modifications to the geometry trigger classes. The trigger has now been tested with...

diff --git a/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx b/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx
index d0fbbcdba4ca94235236e8571450259d87fda9a3..ba7bdeaf977fef864273eb923b5486bce827e8d5 100644 (file)
--- a/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx
+++ b/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx
@@ -112,7 +112,7 @@ int AliHLTTriggerBarrelGeomMultiplicity::DoTrigger()
 
   // try the ESD as input
   const TObject* obj = GetFirstInputObject(kAliHLTAllDataTypes, "AliESDEvent");
-  AliESDEvent* esd = dynamic_cast<AliESDEvent*>(const_cast<TObject*>(obj));
+n  AliESDEvent* esd = dynamic_cast<AliESDEvent*>(const_cast<TObject*>(obj));
   TString description;
 
   if (esd != NULL) 
@@ -392,7 +392,7 @@ int AliHLTTriggerBarrelGeomMultiplicity::ScanConfigurationArgument(int argc, con
       return 2;
     }    
 
-  if (argument.CompareTo("-trgname")==0) 
+  if (argument.CompareTo("-triggername")==0) 
     {
       if (++i>=argc) return -EPROTO;
       

diff --git a/HLT/trigger/AliHLTTriggerBarrelMultiplicity.cxx b/HLT/trigger/AliHLTTriggerBarrelMultiplicity.cxx
index cc12551d824ecc437fa74247714a9cdfa26c6787..cd1e4c59d02738838516ccb1133c198b51142cb5 100644 (file)
--- a/HLT/trigger/AliHLTTriggerBarrelMultiplicity.cxx
+++ b/HLT/trigger/AliHLTTriggerBarrelMultiplicity.cxx
@@ -34,7 +34,6 @@
 #include "AliHLTGlobalBarrelTrack.h"
 #include "TObjArray.h"
 #include "TObjString.h"
-#include "TVector3.h"
 
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTriggerBarrelMultiplicity)

diff --git a/HLT/trigger/AliHLTTriggerDetectorGeom.h b/HLT/trigger/AliHLTTriggerDetectorGeom.h
index 606eb8e7904ed60e71d495a5f198e6656a7e0df4..a6c2044dc507035f5192501ab96f7c9152d360bc 100644 (file)
--- a/HLT/trigger/AliHLTTriggerDetectorGeom.h
+++ b/HLT/trigger/AliHLTTriggerDetectorGeom.h
@@ -17,6 +17,7 @@
 #include "TObject.h"
 #include "TString.h"
 #include <ostream>
+#include "TObject.h"
 
 /**
  * @class  AliHLTTriggerDetectorGeom