-Renamed not static data members according to coding rules

-Updated testPhosClusterEnergyTrigger macro

diff --git a/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx b/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx
index 24c88ce43a80691abb3038a1f98984031a5f7843..8b8d52f4d21cef23ddf86e5d33d0bbd4760704ae 100644 (file)
--- a/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx
+++ b/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx
@@ -48,8 +48,8 @@ AliHLTTriggerCaloClusterEnergy::AliHLTTriggerCaloClusterEnergy(TString detector)
   fClustersRefs(NULL),
   fDetector(detector),
   fClusterReader(NULL),
-  fgkOCDBEntry(""), 
-  fgkInputDataType()
+  fOCDBEntry(""), 
+  fInputDataType()
 {
   // see header file for class documentation
   // or
@@ -62,7 +62,6 @@ AliHLTTriggerCaloClusterEnergy::AliHLTTriggerCaloClusterEnergy(TString detector)
 
 }
 
-//const char* AliHLTTriggerCaloClusterEnergy::fgkOCDBEntry="HLT/ConfigHLT/CaloClusterEnergyTrigger";
 
 AliHLTTriggerCaloClusterEnergy::~AliHLTTriggerCaloClusterEnergy() {
   // see header file for class documentation
@@ -87,7 +86,7 @@ Int_t AliHLTTriggerCaloClusterEnergy::DoTrigger() {
   //Try the caloclusterstruct input
 
   
-  for (const AliHLTComponentBlockData* pBlock=GetFirstInputBlock(fgkInputDataType); pBlock!=NULL; pBlock=GetNextInputBlock()) {
+  for (const AliHLTComponentBlockData* pBlock=GetFirstInputBlock(fInputDataType); pBlock!=NULL; pBlock=GetNextInputBlock()) {
     AliHLTCaloClusterHeaderStruct *caloClusterHeader = reinterpret_cast<AliHLTCaloClusterHeaderStruct*>(pBlock->fPtr);
     fClusterReader->SetMemory(caloClusterHeader);
     
@@ -162,7 +161,7 @@ int AliHLTTriggerCaloClusterEnergy::DoInit(int argc, const char** argv) {
   // see header file for class documentation
 
   // first configure the default
-  int iResult=ConfigureFromCDBTObjString(fgkOCDBEntry);
+  int iResult=ConfigureFromCDBTObjString(fOCDBEntry);
 
   // configure from the command line parameters if specified
   if (iResult>=0 && argc>0) {
@@ -186,7 +185,7 @@ int AliHLTTriggerCaloClusterEnergy::Reconfigure(const char* cdbEntry, const char
 
   // configure from the specified antry or the default one
   const char* entry=cdbEntry;
-  if (!entry || entry[0]==0) entry=fgkOCDBEntry;
+  if (!entry || entry[0]==0) entry=fOCDBEntry;
 
   return ConfigureFromCDBTObjString(entry);
 }
@@ -219,7 +218,7 @@ void AliHLTTriggerCaloClusterEnergy::GetOutputDataSize(unsigned long& constBase,
 void AliHLTTriggerCaloClusterEnergy::GetOCDBObjectDescription( TMap* const targetMap) {
   // Get a list of OCDB object description.
   if (!targetMap) return;
-  targetMap->Add(new TObjString(fgkOCDBEntry),
+  targetMap->Add(new TObjString(fOCDBEntry),
                 new TObjString(Form("%s threshold trigger OCDB object", fDetector.Data()) ) 
                 );
 }

diff --git a/HLT/trigger/AliHLTTriggerCaloClusterEnergy.h b/HLT/trigger/AliHLTTriggerCaloClusterEnergy.h
index ae1bdb663f164cb2c3d11023e9524ef6433cd151..aa497f32daa84921d0d384d4ece80aa41d9226b4 100644 (file)
--- a/HLT/trigger/AliHLTTriggerCaloClusterEnergy.h
+++ b/HLT/trigger/AliHLTTriggerCaloClusterEnergy.h
@@ -129,10 +129,10 @@ protected :
   AliHLTCaloClusterReader * fClusterReader; //!transient
 
   /// the default configuration entry for this component
-  const char* fgkOCDBEntry; //!transient
+  const char* fOCDBEntry; //!transient
 
   
-  AliHLTComponentDataType fgkInputDataType;   ///Input data type for calo struct input, must be set in child class
+  AliHLTComponentDataType fInputDataType;   ///Input data type for calo struct input, must be set in child class
   
 
   ClassDef(AliHLTTriggerCaloClusterEnergy, 0)

diff --git a/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.cxx b/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.cxx
index 596c51e94b42887a5a39998efd653a13bce3f967..a92ffba2dca74fdcfe29c249cad00b788a989bf4 100644 (file)
--- a/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.cxx
+++ b/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.cxx
@@ -50,8 +50,8 @@ AliHLTTriggerCaloClusterEnergy("EMCAL")
   // or
   // visit http://web.ift.uib.no/~kjeks/doc/alice-hlts
 
-  fgkOCDBEntry = "HLT/ConfigHLT/EmcalClusterEnergyTrigger";
-  fgkInputDataType = kAliHLTDataTypeCaloCluster | kAliHLTDataOriginEMCAL;
+  fOCDBEntry = "HLT/ConfigHLT/EmcalClusterEnergyTrigger";
+  fInputDataType = kAliHLTDataTypeCaloCluster | kAliHLTDataOriginEMCAL;
 }
 
 AliHLTTriggerEmcalClusterEnergy::~AliHLTTriggerEmcalClusterEnergy() {

diff --git a/HLT/trigger/AliHLTTriggerPhosClusterEnergy.cxx b/HLT/trigger/AliHLTTriggerPhosClusterEnergy.cxx
index 591823b3896c90515a970eeb7e1750a52679227a..f3c4e582249913d75c15c53e1ceac053956ce041 100644 (file)
--- a/HLT/trigger/AliHLTTriggerPhosClusterEnergy.cxx
+++ b/HLT/trigger/AliHLTTriggerPhosClusterEnergy.cxx
@@ -50,8 +50,8 @@ AliHLTTriggerCaloClusterEnergy("PHOS")
   // or
   // visit http://web.ift.uib.no/~kjeks/doc/alice-hlts
 
-  fgkOCDBEntry = "HLT/ConfigHLT/PhosClusterEnergyTrigger";
-  fgkInputDataType = kAliHLTDataTypeCaloCluster | kAliHLTDataOriginPHOS;
+  fOCDBEntry = "HLT/ConfigHLT/PhosClusterEnergyTrigger";
+  fInputDataType = kAliHLTDataTypeCaloCluster | kAliHLTDataOriginPHOS;
 }
 
 AliHLTTriggerPhosClusterEnergy::~AliHLTTriggerPhosClusterEnergy() {

diff --git a/HLT/trigger/test/testPhosClusterEnergyTrigger.C b/HLT/trigger/test/testPhosClusterEnergyTrigger.C
index eef6f253c90cbded21889d5cacc0d5f5b5981f78..a85f9f71eadd4c301fa953eab954e60d8e34f463 100644 (file)
--- a/HLT/trigger/test/testPhosClusterEnergyTrigger.C
+++ b/HLT/trigger/test/testPhosClusterEnergyTrigger.C
@@ -31,7 +31,6 @@ void CreateInput(const char* filename, Int_t numOfTracks, Double_t minPt, Double
   //cluster.SetClusterType(nuOfmTracks);
 
   event.AddCaloCluster(&cluster);
-  event.SetFirstPHOSCluster(0);
 
   event.Write();
   delete file;
@@ -80,14 +79,14 @@ bool testPhosClusterEnergyTrigger()
   gSystem->Load("libAliHLTMUON.so");
   gSystem->Load("libAliHLTTRD.so");
   gSystem->Load("libAliHLTTrigger.so");
-  CreateInput("PhosClusterEnergyTriggerTestInput1.root", -2, 0.1, 1.99);
+  CreateInput("PhosClusterEnergyTriggerTestInput1.root", -2, 0.1, 0.99);
   CreateInput("PhosClusterEnergyTriggerTestInput2.root", 0, 2.1, 4.0);
   AliHLTSystem sys;
   sys.LoadComponentLibraries("libAliHLTUtil.so");
   sys.LoadComponentLibraries("libAliHLTTrigger.so");
   const char* cmdline = " -datatype ROOTTOBJ 'HLT ' -datafile PhosClusterEnergyTriggerTestInput1.root -nextevent -datafile PhosClusterEnergyTriggerTestInput2.root";
   AliHLTConfiguration pub("pub", "ROOTFilePublisher", NULL, cmdline);
-  AliHLTConfiguration proc("proc", "PhosClusterEnergyTrigger", "pub", "-energy 2");
+  AliHLTConfiguration proc("proc", "PhosClusterEnergyTrigger", "pub", "");
   AliHLTConfiguration sink("sink", "ROOTFileWriter", "proc", "-datafile PhosClusterEnergyTriggerTestOutput.root -concatenate-events");
   sys.BuildTaskList("sink");
   sys.Run(2);