- cosmetics

[u/mrichter/AliRoot.git] / HLT / trigger / AliHLTTriggerBarrelGeomMultiplicity.cxx

diff --git a/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx b/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx
index 3f16ae05e9c2ec898ae477875042e628068c0b6b..48ff24e1fff12a8b3cbdce9418edd260e9cfd5ce 100644 (file)
--- a/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx
+++ b/HLT/trigger/AliHLTTriggerBarrelGeomMultiplicity.cxx
@@ -1,3 +1,4 @@
+// $Id$
 //**************************************************************************
 //* This file is property of and copyright by the ALICE HLT Project        * 
 //* ALICE Experiment at CERN, All rights reserved.                         *
@@ -35,7 +36,6 @@
 #include "AliHLTGlobalBarrelTrack.h"
 #include "TObjArray.h"
 #include "TObjString.h"
-#include "TObjArray.h"
 #include "AliCDBEntry.h"
 #include "AliCDBManager.h"
 #include "TFile.h"
@@ -60,6 +60,8 @@ AliHLTTriggerBarrelGeomMultiplicity::AliHLTTriggerBarrelGeomMultiplicity()
   // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
   fDetectorArray = new TObjArray(1);
 
+  fDetectorArray = new TObjArray(1);
+
   fDetectorArray = new TObjArray;
 
 }
@@ -69,9 +71,10 @@ AliHLTTriggerBarrelGeomMultiplicity::~AliHLTTriggerBarrelGeomMultiplicity()
   // see header file for class documentation
 }
 
-const char* AliHLTTriggerBarrelGeomMultiplicity::GetTriggerName() const
+const char* AliHLTTriggerBarrelGeomMultiplicity::GetTriggerName() const 
 {
   // see header file for class documentation
+
   return "BarrelGeomMultiplicityTrigger";
 }
 
@@ -103,9 +106,13 @@ int AliHLTTriggerBarrelGeomMultiplicity::DoTrigger()
   int iResult=0;
   int numberOfTracks=-1;
 
+  if (!fTriggerDecisionPars) {
+    iResult=-ENODEV;
+  }
+
   // 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) 
@@ -142,34 +149,35 @@ int AliHLTTriggerBarrelGeomMultiplicity::DoTrigger()
        }
     }
 
+  bool condition=false;
+  description="Geometrical conditions not matched";
+  AliHLTReadoutList readout;
+
   if (numberOfTracks>=fMinTracks) 
     {
-      if(fTriggerDecisionPars)
-       {
-
-         SetDescription(fTriggerDecisionPars->GetDescription());
-         AliHLTReadoutList readout(fTriggerDecisionPars->GetReadoutListParameter());
-         AliHLTTriggerDecision decision(
-                                        true,
-                                        fTriggerDecisionPars->GetTriggerName().Data(),
-                                        AliHLTTriggerDomain(readout),
-                                        fTriggerDecisionPars->GetDescription()
-                                        );
-         TriggerEvent(&decision);
-         HLTDebug("Geometrical acceptance trigger %s triggered", fTriggerDecisionPars->GetTriggerName().Data());
-       }
-      else
-       {
-         HLTError("Trigger decision parameters not set, event not triggered");
-       }
+      condition=true;
+      description=fTriggerDecisionPars->GetDescription();
+      readout=fTriggerDecisionPars->GetReadoutListParameter();
+      HLTDebug("Geometrical acceptance trigger %s triggered", fTriggerDecisionPars->GetTriggerName().Data());
     }
+
+  AliHLTTriggerDecision decision(
+                                condition,
+                                fTriggerDecisionPars->GetTriggerName().Data(),
+                                AliHLTTriggerDomain(readout),
+                                description.Data()
+                                );
+  TriggerEvent(&decision, kAliHLTDataTypeTObject|kAliHLTDataOriginOut);
+
   return iResult;
 
 }
 
+
 template<class T>
 bool AliHLTTriggerBarrelGeomMultiplicity::CheckCondition(T* track, float b)
 {
+
   bool ret = false;
 
   // see header file for class documentation
@@ -215,6 +223,11 @@ int AliHLTTriggerBarrelGeomMultiplicity::DoInit(int argc, const char** argv)
   if (iResult>=0 && argc>0)
     iResult=ConfigureFromArgumentString(argc, argv);
 
+  if (!fTriggerDecisionPars) {
+    HLTError("decision parameter not initialized");
+    iResult=-ENODEV;
+  }
+
   return iResult;
 }
 
@@ -226,7 +239,8 @@ int AliHLTTriggerBarrelGeomMultiplicity::DoDeinit()
 
 int AliHLTTriggerBarrelGeomMultiplicity::ReadPreprocessorValues(const char* /*modules*/)
 {
-  // see header file for class documentation
+    // see header file for function documentation
+  int nDetectorGeoms=0;
 
   // TODO 2009-10-10: implementation
   // for the moment very quick, just reload the magnetic field
@@ -360,7 +374,6 @@ int AliHLTTriggerBarrelGeomMultiplicity::GetDetectorGeomsFromFile(const char *fi
     }
   HLTInfo("received %d detector geometries", nDetectorGeoms);
 
-
   return nDetectorGeoms;
 }