Updates

sevdokim · Jun 7, 2013 · 2b2cd76 · 2b2cd76
2 parents 82e2e6b + bb2def9
commit 2b2cd76
Show file tree

Hide file tree

Showing 23 changed files with 2,533 additions and 2,799 deletions.
diff --git a/HLT/.gitignore b/HLT/.gitignore
@@ -0,0 +1,14 @@
+*~
+COPYING
+INSTALL
+aclocal.m4
+autom4te.cache/
+build/
+config.guess
+config.log
+config.sub
+configure
+depcomp
+install-sh
+ltmain.sh
+missing
diff --git a/HLT/BASE/setenv.csh.in b/HLT/BASE/setenv.csh.in
@@ -35,7 +35,6 @@ set ADD_BINDIR=
 set ADD_BINDIR="$bindir         $ADD_BINDIR"
 set ADD_BINDIR="@ALIROOTBINDIR@ $ADD_BINDIR"
 set ADD_BINDIR="@ROOTBINDIR@    $ADD_BINDIR"
-set ADD_BINDIR="@HOMER_BINDIR@  $ADD_BINDIR"
 if ( $?PATH == 0 ) setenv PATH ""
 foreach i ($ADD_BINDIR)
   setenv PATH "${i}:$PATH"

diff --git a/HLT/BASE/setenv.sh.in b/HLT/BASE/setenv.sh.in
@@ -30,5 +30,4 @@ for i in $ADD_LIBDIR ; do export LD_LIBRARY_PATH="$i:$LD_LIBRARY_PATH"; done
 ADD_BINDIR="$bindir         $ADD_BINDIR"
 ADD_BINDIR="@ALIROOTBINDIR@ $ADD_BINDIR"
 ADD_BINDIR="@ROOTBINDIR@    $ADD_BINDIR"
-ADD_BINDIR="@HOMER_BINDIR@  $ADD_BINDIR"
 for i in $ADD_BINDIR ; do export PATH="${i}:$PATH"; done
diff --git a/HLT/BASE/util/AliHLTESDCaloClusterMaker.cxx b/HLT/BASE/util/AliHLTESDCaloClusterMaker.cxx
@@ -69,27 +69,14 @@ AliHLTESDCaloClusterMaker::FillESD(AliESDEvent *esdPtr, const AliHLTCaloClusterH
       AliESDCaloCluster esdCluster;
 
       esdCluster.SetID(caloClusterStructPtr->fID);
-#ifndef HAVE_NOT_ALIVCLUSTER // backward compatibility for r42844
       esdCluster.SetType(caloClusterStructPtr->fClusterType);
-#else
-      esdCluster.SetClusterType(caloClusterStructPtr->fClusterType);
-#endif
       esdCluster.SetPosition((Float_t*)(caloClusterStructPtr->fGlobalPos));
       esdCluster.SetE(caloClusterStructPtr->fEnergy);
       esdCluster.SetTOF(caloClusterStructPtr->fTOF);
-#ifndef HAVE_NOT_ALIVCLUSTER // backward compatibility for r42844
       esdCluster.SetDispersion(caloClusterStructPtr->fDispersion);
       esdCluster.SetChi2(caloClusterStructPtr->fFitQuality);
-#else
-      esdCluster.SetClusterDisp(caloClusterStructPtr->fDispersion);
-      esdCluster.SetClusterChi2(caloClusterStructPtr->fFitQuality);
-#endif
       const Float_t *pid = caloClusterStructPtr->fPID;
-#ifndef HAVE_NOT_ALIVCLUSTER // backward compatibility for r42844
       esdCluster.SetPID(pid);
-#else
-      esdCluster.SetPid(pid);
-#endif
       esdCluster.SetM20(caloClusterStructPtr->fM20);
       esdCluster.SetM02(caloClusterStructPtr->fM02);
       esdCluster.SetNExMax(caloClusterStructPtr->fNExMax);

diff --git a/HLT/CALO/AliHLTCaloClusterAnalyser.cxx b/HLT/CALO/AliHLTCaloClusterAnalyser.cxx
@@ -57,11 +57,7 @@ AliHLTCaloClusterAnalyser::AliHLTCaloClusterAnalyser() :
   fDoPID(false),
   fHaveDistanceToBadChannel(false),
   fGeometry(0),
-#ifndef HAVE_NOT_ALIVCLUSTER // backward compatibility for r42844
   fClusterType(AliVCluster::kPHOSNeutral),
-#else
-  fClusterType(AliESDCaloCluster::kPHOSCluster),
-#endif
   fRecoParamsPtr(0),
   fCutOnSingleCellClusters(false),
   fSingleCellEnergyCut(0.5)

diff --git a/HLT/MUON/OfflineInterface/AliHLTMUONDigitPublisherComponent.cxx b/HLT/MUON/OfflineInterface/AliHLTMUONDigitPublisherComponent.cxx
@@ -684,12 +684,7 @@ int AliHLTMUONDigitPublisherComponent::GetEvent(
 	}
 
 	// Make sure we have the correct CTP trigger loaded.
-#ifndef HAVE_NOT_ALIRUNLOADER30859
 	AliRunLoader* runloader = AliRunLoader::Instance();
-#else
-	// the old way before rev 30859
-	AliRunLoader *runloader = AliRunLoader::GetRunLoader();
-#endif
 	if (runloader != NULL)
 	{
 		if (runloader->GetTrigger() == NULL)
@@ -923,12 +918,7 @@ int AliHLTMUONDigitPublisherComponent::WriteTrackerDDL(
   AliRawDataHeader* header = reinterpret_cast<AliRawDataHeader*>(outBuffer);
   // Fill header with default values.
   *header = AliRawDataHeader();
-#ifndef HAVE_NOT_ALIRUNLOADER30859
   AliRunLoader* runloader = AliRunLoader::Instance();
-#else
-  // the old way before rev 30859
-  AliRunLoader *runloader = AliRunLoader::GetRunLoader();
-#endif
   if (runloader != NULL)
   {
     if (runloader->GetTrigger() != NULL)
@@ -1135,12 +1125,7 @@ int AliHLTMUONDigitPublisherComponent::WriteTriggerDDL(
   AliRawDataHeader* header = reinterpret_cast<AliRawDataHeader*>(outBuffer);
   // Fill header with default values.
   *header = AliRawDataHeader();
-#ifndef HAVE_NOT_ALIRUNLOADER30859
   AliRunLoader* runloader = AliRunLoader::Instance();
-#else
-  // the old way before rev 30859
-  AliRunLoader *runloader = AliRunLoader::GetRunLoader();
-#endif
   if (runloader != NULL)
   {
     if (runloader->GetTrigger() != NULL)

diff --git a/HLT/Makefile.am b/HLT/Makefile.am
@@ -73,9 +73,7 @@ if EN_HLT_VZERO
 VZERO_DIR=VZERO
 endif
 
-if EN_HLT_QA
 QA_DIR=QA
-endif
 
 SUBDIRS 		= BASE \
 			  $(ALIROOT_DEP) \

diff --git a/HLT/TPCLib/tracking-ca/AliTPCtrackerCA.cxx b/HLT/TPCLib/tracking-ca/AliTPCtrackerCA.cxx
@@ -161,12 +161,7 @@ int AliTPCtrackerCA::LoadClusters ( TTree * fromTree )
   // load mc tracks
   while ( fDoHLTPerformance ) {
     if ( !gAlice ) break;
-#ifndef HAVE_NOT_ALIRUNLOADER30859
     AliRunLoader *rl = AliRunLoader::Instance();//gAlice->GetRunLoader();
-#else
-    // the old way before rev 30859
-    AliRunLoader *rl = AliRunLoader::GetRunLoader();
-#endif
     if ( !rl ) break;
     rl->LoadKinematics();
     AliStack *stack = rl->Stack();