Update handling of different inputs

diff --git a/HLT/JET/AliHLTJETReader.cxx b/HLT/JET/AliHLTJETReader.cxx
index 6d4a7f82d6d4dfc20e4880334d313ff1f67a83be..192463bc3dd69eb251f629d850588b66a1d7c3d0 100644 (file)
--- a/HLT/JET/AliHLTJETReader.cxx
+++ b/HLT/JET/AliHLTJETReader.cxx
@@ -134,15 +134,6 @@ Int_t AliHLTJETReader::Initialize() {
  
   // -- Get ptr to cuts from reader
   // --------------------------------
- 
-  // -- Seed cuts
-  if ( ! iResult ) {
-    fSeedCuts = readerHeader->GetSeedCuts();
-    if ( ! fSeedCuts ) {
-      HLTError("Error getting ptr to seed cuts.");
-      iResult = -EINPROGRESS;
-    }
-  }
 
   // -- Track cuts
   if ( ! iResult ) {
@@ -423,7 +414,6 @@ Bool_t AliHLTJETReader::FillVectorESD() {
   
   HLTInfo(" Number of selected tracks %d", nTracks);
 
-
   return bResult;
 }
 
@@ -735,6 +725,18 @@ Int_t AliHLTJETReader::InitializeFFSC() {
       iResult = -EINPROGRESS;
     }
   }
+
+  // -- Get ptr to cuts from reader
+  // --------------------------------
+ 
+  // -- Seed cuts
+  if ( ! iResult ) {
+    fSeedCuts = readerHeader->GetSeedCuts();
+    if ( ! fSeedCuts ) {
+      HLTError("Error getting ptr to seed cuts.");
+      iResult = -EINPROGRESS;
+    }
+  }
  
   return iResult;
 }

diff --git a/HLT/JET/AliHLTJETReaderHeader.cxx b/HLT/JET/AliHLTJETReaderHeader.cxx
index 8184e3e64d9c2ef61fa24ae630bf41a98c76e3a1..3348aa80f3dc51ceb545578b6ad326b2183646c4 100644 (file)
--- a/HLT/JET/AliHLTJETReaderHeader.cxx
+++ b/HLT/JET/AliHLTJETReaderHeader.cxx
@@ -110,17 +110,20 @@ Int_t AliHLTJETReaderHeader::Initialize() {
     HLTInfo(" -= TrackCuts =- " );
   }
 
-  if ( ! fSeedCuts ) {
-    HLTError("No seed cuts set in reader header");
-    iResult = -EINPROGRESS;
-  }
-  else {
-    fSeedCuts->SetEtaRange( fFiducialEtaMin+fConeRadius, 
-                            fFiducialEtaMax-fConeRadius );
-    fSeedCuts->SetPhiRange( fFiducialPhiMin, fFiducialPhiMax );
-    HLTInfo(" -= SeedCuts =- " );
+  // Check for seeds only cone based algoritms
+  if ( fAlgorithm >= AliHLTJETBase::kFFSCSquareCell ) {
+    if ( !fSeedCuts ) {
+      HLTError("No seed cuts set in reader header");
+      iResult = -EINPROGRESS;
+    }
+    else {
+      fSeedCuts->SetEtaRange( fFiducialEtaMin+fConeRadius, 
+                             fFiducialEtaMax-fConeRadius );
+      fSeedCuts->SetPhiRange( fFiducialPhiMin, fFiducialPhiMax );
+      HLTInfo(" -= SeedCuts =- " );
+    }
   }
-
+  
   return iResult;
 }
 

diff --git a/HLT/JET/AliHLTJETReaderHeader.h b/HLT/JET/AliHLTJETReaderHeader.h
index 6b3499450652747ac313ce54a9cfeccd3ad732a2..ba5402fc676515caea76ff0cfab510d12cbf0106 100644 (file)
--- a/HLT/JET/AliHLTJETReaderHeader.h
+++ b/HLT/JET/AliHLTJETReaderHeader.h
@@ -171,7 +171,7 @@ private:
   /** Cone radius */
   Float_t                    fConeRadius;           // see above
   
-  /** Use MC Data -- only neede for off-line*/
+  /** Use MC Data -- only needed for off-line */
   Bool_t                     fUseMC;                // see above 
 
   ClassDef(AliHLTJETReaderHeader, 1)

diff --git a/HLT/JET/AliHLTJETTrackCuts.cxx b/HLT/JET/AliHLTJETTrackCuts.cxx
index c5d4e72eedd46457f40b36a61a618d81a1e2d549..f3cf58dc0d075556024aad0838b47169292d347f 100644 (file)
--- a/HLT/JET/AliHLTJETTrackCuts.cxx
+++ b/HLT/JET/AliHLTJETTrackCuts.cxx
@@ -116,8 +116,12 @@ Bool_t AliHLTJETTrackCuts::IsSelected( TParticle *particle ) {
     bResult = kFALSE;
 
   // -- Charged particles only
-  if ( fChargedOnly && !particle->GetPDG()->Charge() )
+  if ( ! particle->GetPDG() )
     bResult = kFALSE;
+  else {
+    if ( fChargedOnly && !particle->GetPDG()->Charge() )
+      bResult = kFALSE;
+  }
 
   // -- cut on min Pt
   if ( particle->Pt() < fPtMin )

diff --git a/HLT/JET/fastjet/AliHLTJETFastJetComponent.cxx b/HLT/JET/fastjet/AliHLTJETFastJetComponent.cxx
index ab17345deb1525d6acd2f91362c334da2727f7e7..4c06c10293e67630e36f89685b99c1d92f3bf019 100644 (file)
--- a/HLT/JET/fastjet/AliHLTJETFastJetComponent.cxx
+++ b/HLT/JET/fastjet/AliHLTJETFastJetComponent.cxx
@@ -5,7 +5,7 @@
 //* This file is property of and copyright by the ALICE HLT Project        * 
 //* ALICE Experiment at CERN, All rights reserved.                         *
 //*                                                                        *
-//* Primary Authors: Jochen Thaeder <thaeder@kip.uni-heidelberg.de>        *
+//* Primary Authors: Jochen Thaeder <jochen@thaeder.de>                    *
 //*                  for The ALICE HLT Project.                            *
 //*                                                                        *
 //* Permission to use, copy, modify and distribute this software and its   *
@@ -18,9 +18,8 @@
 //**************************************************************************
 
 /** @file   AliHLTJETFastJetComponent.cxx
-    @author Jochen Thaeder <thaeder@kip.uni-heidelberg.de>
-    @date   
-    @brief   Component to run the FastJet jetfinder
+    @author Jochen Thaeder <jochen@thaeder.de>
+    @brief  Component to run the FastJet jetfinder
 */
 
 #if __GNUC__>= 3