From 310959815b84848bb0a106f90b230e1b81e45b05 Mon Sep 17 00:00:00 2001 From: richterm Date: Tue, 4 Jun 2013 12:41:23 +0000 Subject: [PATCH] deleting deprecated and uneffective defines --- HLT/BASE/setenv.csh.in | 1 - HLT/BASE/setenv.sh.in | 1 - HLT/BASE/util/AliHLTESDCaloClusterMaker.cxx | 13 ------------- HLT/CALO/AliHLTCaloClusterAnalyser.cxx | 4 ---- .../AliHLTMUONDigitPublisherComponent.cxx | 15 --------------- HLT/TPCLib/tracking-ca/AliTPCtrackerCA.cxx | 5 ----- HLT/pendolino/AliHLTPendolino.cxx | 8 -------- HLT/pendolino/AliHLTPendolino.h | 14 -------------- HLT/rec/test/testAliRawReader.C | 2 -- 9 files changed, 63 deletions(-) diff --git a/HLT/BASE/setenv.csh.in b/HLT/BASE/setenv.csh.in index 2bd9ce22925..91b5b9bc433 100644 --- 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 index 7bd629bc42c..49ea1c195ba 100644 --- 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 index f685bf36e74..3717a2ee17d 100644 --- 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 index 66fee315f83..d38841bbab3 100644 --- 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 index 306161bab35..17c8fc41131 100644 --- 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(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(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/TPCLib/tracking-ca/AliTPCtrackerCA.cxx b/HLT/TPCLib/tracking-ca/AliTPCtrackerCA.cxx index 404b50db537..de92023e834 100644 --- 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(); diff --git a/HLT/pendolino/AliHLTPendolino.cxx b/HLT/pendolino/AliHLTPendolino.cxx index 924df0cfbb2..531f9eb6294 100644 --- a/HLT/pendolino/AliHLTPendolino.cxx +++ b/HLT/pendolino/AliHLTPendolino.cxx @@ -771,20 +771,12 @@ Int_t AliHLTPendolino::initPredictProc(TString detector, Int_t run, } -#ifdef SHUTTLE_PRE_REV29388_INTERFACE -const UInt_t AliHLTPendolino::GetStartTimeDCSQuery() -#else UInt_t AliHLTPendolino::GetStartTimeDCSQuery() -#endif { return fStartTime; } -#ifdef SHUTTLE_PRE_REV29388_INTERFACE -const UInt_t AliHLTPendolino::GetEndTimeDCSQuery() -#else UInt_t AliHLTPendolino::GetEndTimeDCSQuery() -#endif { return fEndTime; } diff --git a/HLT/pendolino/AliHLTPendolino.h b/HLT/pendolino/AliHLTPendolino.h index b2fcd1ecfca..77399796aa0 100644 --- a/HLT/pendolino/AliHLTPendolino.h +++ b/HLT/pendolino/AliHLTPendolino.h @@ -22,12 +22,6 @@ //#include "AliHLTPredictionProcessorInterface.h" -#ifdef SHUTTLE_PRE_REV29388_INTERFACE -#define CONST_PROPERTY const -#else -#define CONST_PROPERTY -#endif - class AliHLTPendolinoLogger; /** @@ -381,11 +375,7 @@ class AliHLTPendolino : public AliShuttleInterface { * implementation in the Offline Shuttle - there the initial start time * is set to the start-of-data for the complete run.) */ -#ifdef SHUTTLE_PRE_REV29388_INTERFACE - virtual const UInt_t GetStartTimeDCSQuery(); -#else virtual UInt_t GetStartTimeDCSQuery(); -#endif /** * Function to get the end time of the DCS Archive DB request; in HLT @@ -394,11 +384,7 @@ class AliHLTPendolino : public AliShuttleInterface { * implementation in the Offline Shuttle - there the initial end time * is set to the end-of-data for the complete run.) */ -#ifdef SHUTTLE_PRE_REV29388_INTERFACE - virtual const UInt_t GetEndTimeDCSQuery(); -#else virtual UInt_t GetEndTimeDCSQuery(); -#endif /** * method introduced as pure virtual in r43691 diff --git a/HLT/rec/test/testAliRawReader.C b/HLT/rec/test/testAliRawReader.C index 41c18bc5ea0..5501dd94ae0 100644 --- a/HLT/rec/test/testAliRawReader.C +++ b/HLT/rec/test/testAliRawReader.C @@ -248,7 +248,6 @@ int CheckRawReaderMemory(TArrayC* ddlArray, int* ddlidArray, int nofDDLs) return -1; } -#ifndef HAVE_NOT_ALIRAWREADERMEMORY_ADDBUFFER ///////////////////////////////////////////////////////////////////////////////////////// if (gbVerbose) cout << "checking AliRawReaderMemory with multiple buffers ..." << endl; pRawReaderMemory->RewindEvents(); @@ -304,7 +303,6 @@ int CheckRawReaderMemory(TArrayC* ddlArray, int* ddlidArray, int nofDDLs) cerr << "error: RawReaderMemory::NextEvent returns true, while no more events should be there" << endl; return -1; } -#endif //HAVE_NOT_ALIRAWREADERMEMORY_ADDBUFFER delete pRawReaderMemory; pRawReaderMemory=NULL; -- 2.43.0