Update to FindFASTJET.cmake; now accepts also for -DFASTJET= option

[u/mrichter/AliRoot.git] / ITS / AliITSTriggerFOProcessor.cxx

diff --git a/ITS/AliITSTriggerFOProcessor.cxx b/ITS/AliITSTriggerFOProcessor.cxx
index e9b4c34f465e37b4e3d7ab81ee7f306844804986..7f044bbcaeb3f5d4e838dee24981be16b061cf63 100644 (file)
--- a/ITS/AliITSTriggerFOProcessor.cxx
+++ b/ITS/AliITSTriggerFOProcessor.cxx
@@ -55,7 +55,7 @@ AliITSTriggerFOProcessor& AliITSTriggerFOProcessor::operator=(const AliITSTrigge
   return *this;
 }
 //______________________________________________________________________
-void AliITSTriggerFOProcessor::SetTriggerConditions(AliITSTriggerConditions* ocdbCond) {
+void AliITSTriggerFOProcessor::SetTriggerConditions(AliITSTriggerConditions* const ocdbCond) {
   // Method to give pointer to the OCDB conditions entry
   fTriggerCond = ocdbCond;
 }
@@ -78,7 +78,7 @@ const Char_t* AliITSTriggerFOProcessor::GetOutputLabel(Short_t index) const {
   return fTriggerCond->GetAlgoLabelI(index);
 }
 //______________________________________________________________________
-void AliITSTriggerFOProcessor::PreprocessFOSignals(AliITSFOSignalsSPD* signals) {
+void AliITSTriggerFOProcessor::PreprocessFOSignals(AliITSFOSignalsSPD* const signals) {
   // Pre-process the fast-or signals to retrieve some data needed by most algorithms
   if (fTriggerCond==NULL) {
     Error("AliITSTriggerFOProcessor::PreprocessFOSignals","Trigger conditions entry not yet given.");
@@ -119,14 +119,14 @@ Bool_t AliITSTriggerFOProcessor::ProcessFOSignalsLabel(const Char_t* label, AliI
   }
   
   if      (strcmp(label, "0SMB") == 0) return ProcessFOSignalsTHRTotalAndTHRInnerAndTHROuter(index, signals);
-  else if (strcmp(label, "0SH1") == 0) return ProcessFOSignalsTHRInnerAndTHROuter(index, signals);//ok
-  else if (strcmp(label, "0SH2") == 0) return ProcessFOSignalsTHRInnerAndTHROuter(index, signals);//ok
-  else if (strcmp(label, "0SH3") == 0) return ProcessFOSignalsTHRInnerAndTHROuter(index, signals);//ok
-  else if (strcmp(label, "0SH4") == 0) return ProcessFOSignalsTHRInnerAndTHROuter(index, signals);//
-  else if (strcmp(label, "0SPF") == 0) return ProcessFOSignalsTHRTotalAndTHRInnerAndTHROuter(index, signals);//ok
-  else if (strcmp(label, "0SBK") == 0) return ProcessFOSignalsInnerGTOuterPlusOffset(index, signals);
-  else if (strcmp(label, "0SX1") == 0) return ProcessFOSignalsOuterGTInnerPlusOffset(index, signals);
-  else if (strcmp(label, "0SX2") == 0) return ProcessFOSignalsTHRTotal(index, signals);
+  else if (strcmp(label, "0SH1") == 0) return ProcessFOSignalsTHRInnerAndTHROuter(index, signals);
+  else if (strcmp(label, "0SH2") == 0) return ProcessFOSignalsTHRInnerAndTHROuter(index, signals);
+  else if (strcmp(label, "0SH3") == 0) return ProcessFOSignalsTHRInnerAndTHROuter(index, signals);
+  else if (strcmp(label, "0SH4") == 0) return ProcessFOSignalsTHRInnerAndTHROuter(index, signals);
+  else if (strcmp(label, "0SPF") == 0) return ProcessFOSignalsTHRTotalAndTHRInnerAndTHROuter(index, signals);
+  else if (strcmp(label, "0SX1") == 0) return ProcessFOSignalsInnerGTOuterPlusOffset(index, signals);
+  else if (strcmp(label, "0SX2") == 0) return ProcessFOSignalsOuterGTInnerPlusOffset(index, signals);
+  else if (strcmp(label, "0SBK") == 0) return ProcessFOSignalsTHRTotal(index, signals);
   else if (strcmp(label, "0SCO") == 0) return ProcessFOSignalsCosmic(index, signals);
 
   else {
@@ -197,8 +197,7 @@ Bool_t AliITSTriggerFOProcessor::ProcessFOSignalsTHRTotal(Short_t index, AliITSF
   }
   
   // Get parameter values:
-  //Int_t thIO = fTriggerCond->GetAlgoParamValueIN(index, "total_threshold");
-  Int_t thIO = fTriggerCond->GetAlgoParamValueIN(index, "offset");
+  Int_t thIO = fTriggerCond->GetAlgoParamValueIN(index, "background_threshold_both");
   if (thIO<0) {
     Error("AliITSTriggerFOProcessor::ProcessFOSignalsTHRTotal","Parameter 'total_threshold' not defined");
     return kFALSE;
@@ -217,7 +216,7 @@ Bool_t AliITSTriggerFOProcessor::ProcessFOSignalsInnerGTOuterPlusOffset(Short_t
   }
   
   // Get parameter values:
-  Int_t offset = fTriggerCond->GetAlgoParamValueIN(index, "total_threshold");
+  Int_t offset = fTriggerCond->GetAlgoParamValueIN(index, "background_offset_inner");
   if (offset<0) {
     Error("AliITSTriggerFOProcessor::ProcessFOSignalsInnerGTOuterPlusOffset","Parameter 'offset' not defined");
     return kFALSE;
@@ -236,7 +235,7 @@ Bool_t AliITSTriggerFOProcessor::ProcessFOSignalsOuterGTInnerPlusOffset(Short_t
   }
   
   // Get parameter values:
-  Int_t offset = fTriggerCond->GetAlgoParamValueIN(index, "offset");
+  Int_t offset = fTriggerCond->GetAlgoParamValueIN(index, "background_offset_outer");
   if (offset<0) {
     Error("AliITSTriggerFOProcessor::ProcessFOSignalsOuterGTInnerPlusOffset","Parameter 'offset' not defined");
     return kFALSE;
@@ -246,7 +245,7 @@ Bool_t AliITSTriggerFOProcessor::ProcessFOSignalsOuterGTInnerPlusOffset(Short_t
   return (fFOOuter >=  fFOInner + offset);
 }
 //______________________________________________________________________
-Bool_t AliITSTriggerFOProcessor::ProcessFOSignalsCosmic(Short_t index, AliITSFOSignalsSPD* signals) {
+Bool_t AliITSTriggerFOProcessor::ProcessFOSignalsCosmic(Short_t index, AliITSFOSignalsSPD* const signals) {
   // NB: For every event - Always call PreprocessFOSignals before calling this method
   // Process algorithm 'cosmic' (index is needed to get the correct parameters from the ocdb object)
   if (fTriggerCond==NULL) {
@@ -304,7 +303,7 @@ Bool_t AliITSTriggerFOProcessor::ProcessFOSignalsCosmic(Short_t index, AliITSFOS
   // global or
   if (cosmicParam == 5) return (fFOOuter>0 || fFOInner>0);
 
-  Error("AliITSTriggerFOProcessor::ProcessFOSignalsCosmic",Form("'cosmic_algorithm_parameter' = %d not defined",cosmicParam));
+  Error("AliITSTriggerFOProcessor::ProcessFOSignalsCosmic","'cosmic_algorithm_parameter' = %d not defined",cosmicParam);
   return kFALSE;
 }