- adding functionality for loading detector geometries from OCDB or ROOT file

diff --git a/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx b/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx
index aa399b9f7c340657c494722e54319af818c4d75f..1b461cfaf3838792eddebcde123c9d4adb6d84bc 100644 (file)
--- a/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx
+++ b/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx
@@ -17,7 +17,6 @@
 /// @file   AliHLTTriggerBarrelGeomMultiplicity.cxx
 /// @author Oystein Djuvsland
 /// @date   2009-10-08
-
 /// @brief  HLT trigger component for charged particle multiplicity 
 ///         within a geometrical acceptance in the central barrel.
 
@@ -28,7 +27,6 @@
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
 
 #include "AliHLTTriggerBarrelGeomMultiplicity.h"
-
 #include "AliHLTTriggerDetectorGeom.h"
 #include "AliHLTTriggerDecisionParameters.h"
 #include "AliESDEvent.h"
@@ -66,16 +64,11 @@ AliHLTTriggerBarrelGeomMultiplicity::AliHLTTriggerBarrelGeomMultiplicity()
 
 }
 
-
-const char* AliHLTTriggerBarrelGeomMultiplicity::fgkOCDBEntry="HLT/ConfigHLT/BarrelGeomMultiplicityTrigger";
-
->>>>>>> - Adding the new track multiplicity trigger cutting on geometrical acceptance
 AliHLTTriggerBarrelGeomMultiplicity::~AliHLTTriggerBarrelGeomMultiplicity()
 {
   // see header file for class documentation
 }
 
-
 const char* AliHLTTriggerBarrelGeomMultiplicity::GetTriggerName() const
 {
   // see header file for class documentation
@@ -88,7 +81,6 @@ AliHLTComponent* AliHLTTriggerBarrelGeomMultiplicity::Spawn()
   return new AliHLTTriggerBarrelGeomMultiplicity;
 }
 
-
 int AliHLTTriggerBarrelGeomMultiplicity::Reconfigure(const char *cdbEntry, const char *chainId)
 {
   // see header file for class documentation
@@ -105,7 +97,6 @@ int AliHLTTriggerBarrelGeomMultiplicity::Reconfigure(const char *cdbEntry, const
   return GetDetectorGeomsFromCDBObject(entry, chainId);
 } 
 
-
 int AliHLTTriggerBarrelGeomMultiplicity::DoTrigger()
 {
   // see header file for class documentation
@@ -121,7 +112,6 @@ int AliHLTTriggerBarrelGeomMultiplicity::DoTrigger()
     {
       numberOfTracks=0;
       esd->GetStdContent();
-
       for (Int_t i = 0; i < esd->GetNumberOfTracks(); i++) 
        {
          if (CheckCondition(esd->GetTrack(i), esd->GetMagneticField())) numberOfTracks++;
@@ -152,6 +142,7 @@ int AliHLTTriggerBarrelGeomMultiplicity::DoTrigger()
        }
     }
 
+
   if (numberOfTracks>=fMinTracks) 
     {
       SetDescription(fTriggerDecisionPars->GetDescription());
@@ -166,12 +157,12 @@ int AliHLTTriggerBarrelGeomMultiplicity::DoTrigger()
     }
   
   return iResult;
+
 }
 
 template<class T>
 bool AliHLTTriggerBarrelGeomMultiplicity::CheckCondition(T* track, float b)
 {
-
   bool ret = false;
 
   // see header file for class documentation
@@ -221,12 +212,11 @@ int AliHLTTriggerBarrelGeomMultiplicity::DoInit(int argc, const char** argv)
 }
 
 int AliHLTTriggerBarrelGeomMultiplicity::DoDeinit()
-{
+ {
   // see header file for class documentation
   return 0;
 }
 
-
 int AliHLTTriggerBarrelGeomMultiplicity::ReadPreprocessorValues(const char* /*modules*/)
 {
   // see header file for class documentation
@@ -340,12 +330,11 @@ int AliHLTTriggerBarrelGeomMultiplicity::GetDetectorGeomsFromFile(const char *fi
 
 int AliHLTTriggerBarrelGeomMultiplicity::ScanConfigurationArgument(int argc, const char** argv)
 {
-  // see header file for class documentation
+  // See header file for class documentation
   if (argc<=0) return 0;
   int i=0;
   TString argument=argv[i];
 
-
   if (argument.CompareTo("-geomfile")==0) 
     {
       if (++i>=argc) return -EPROTO;

diff --git a/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.h b/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.h
index b35d68d20ba8a0663ff5a35b9ef3332ad20be932..614f5368b4cca97e48831e7e4256707e8796c115 100644 (file)
--- a/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.h
+++ b/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.h
@@ -90,7 +90,6 @@ class AliHLTTriggerBarrelGeomMultiplicity : public AliHLTTrigger
 
   /// inherited from AliHLTComponent, scan one argument and
   /// its parameters
-
   virtual int ScanConfigurationArgument(int argc, const char** argv);
   
   // Get the detector geometries from CDB entry
@@ -105,7 +104,6 @@ class AliHLTTriggerBarrelGeomMultiplicity : public AliHLTTrigger
  private:
 
   /// inherited from AliHLTTrigger: calculate the trigger
-
   virtual int DoTrigger();
 
   /// check whether a track meets the criteria  

diff --git a/HLT/trigger/AliHLTTriggerDetectorGeom.cxx b/HLT/trigger/AliHLTTriggerDetectorGeom.cxx
index 48f69628520736a1de2eaea5b30906c0b1bcb6ae..f54fe3a2b1f90a4344758ca8446fbc2d2e9a0f41 100644 (file)
--- a/HLT/trigger/AliHLTTriggerDetectorGeom.cxx
+++ b/HLT/trigger/AliHLTTriggerDetectorGeom.cxx
@@ -74,12 +74,14 @@ void AliHLTTriggerDetectorGeom::SetNormVector(Double_t *nVector)
 void AliHLTTriggerDetectorGeom::GetInitialPoint(Double_t *point)
 {
   // See header file for class documentation
+
   for(int i = 0; i < 3; i++)
     {
       point[i] = fInitalPoint[i];
     }
 }
 
+
 void AliHLTTriggerDetectorGeom::GetNormVector(Double_t *vec)
 {
   // See header file for class documentation
@@ -98,6 +100,7 @@ void AliHLTTriggerDetectorGeom::PrintDetectorGeom(std::ostream &out)
   out << "Eta Max: " << fEtaMax << std::endl;
   out << "Phi Min: " << fPhiMin << std::endl;
   out << "Phi Max: " << fPhiMax << std::endl;
+
   out << "Initial Point: {" << fInitalPoint[0] << ", " << fInitalPoint[1] << ", " << fInitalPoint[2] << "}" << std::endl; 
   out << "Normal Vector: {" << fNormVector[0] << ", " << fNormVector[1] << ", " << fNormVector[2] << "}" << std::endl; 
 }

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