From c2aad3ae1100f4f7bc489afceea36a03dfce5163 Mon Sep 17 00:00:00 2001 From: svnbits Date: Tue, 30 Apr 2013 12:18:57 +0000 Subject: [PATCH] #101318: Patch for various problems in AliROOT Patch to fix various problems in AliROOT - mainly missing using std::...; missing installation of data files, wrong inclusion of Makefile.arch, etc. Christian --- CMakeLists.txt | 3 + EVE/alice-macros/clusters.C | 19 +-- EVE/alice-macros/emcal_digits.C | 16 +- ITS/AliITSv11GeometrySSD.cxx | 146 +++++++++--------- ITS/CMakelibITSrec.pkg | 2 +- JETAN/AliJetMCReader.cxx | 2 +- MUON/CMakelibMUONrec.pkg | 4 +- OADB/Makefile | 14 +- PWG/EMCAL/AliEMCALClusterParams.cxx | 3 + PWG/FLOW/Base/AliFlowAnalysisWithMSP.cxx | 7 +- PWG/muondep/AliAnalysisTriggerScalers.cxx | 2 +- PWG/muondep/AliMuonAccEffSubmitter.cxx | 3 +- .../AliAnalysisTaskDptDptCorrelations.cxx | 4 +- PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx | 3 + PWGCF/EBYE/LRC/AliAnalysisTaskLRC.cxx | 3 + PWGCF/EBYE/LRC/AliLRCProcess.cxx | 3 + .../AliEbyEParticleRatioFluctuationTask.cxx | 3 + .../AliAnalysisTaskEMCALIsoPhoton.cxx | 4 + PWGHF/CMakelibPWGHFvertexingHF.pkg | 6 +- PWGHF/hfe/AliAnalysisTaskHFECal.cxx | 2 + .../AliAnalysisTaskFragmentationFunction.cxx | 3 + PWGJE/AliFragmentationFunctionCorrections.cxx | 4 + PWGJE/CMakelibPWGJE.pkg | 6 + PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx | 3 + .../AliAnalysisTaskChargedJetsPA.cxx | 2 +- .../AliAnalysisTaskEmcalJetHadCorQA.cxx | 1 + PWGPP/TRD/macros/AddTRDcheckPID.C | 3 +- PWGPP/TRD/macros/AddTRDv0Monitor.C | 3 +- STEER/STEER/AliAlignmentTracks.cxx | 3 +- STRUCT/AliPIPEv3.cxx | 3 +- TEvtGen/EvtGenModels/EvtPyGaGa.cxx | 12 +- TEvtGen/EvtGenModels/EvtPycont.cxx | 52 +++---- TOF/AliTOF.cxx | 5 +- TOF/AliTOFv6T0.cxx | 5 +- TRD/AliTRDgtuTMU.cxx | 20 +-- cmake/CMakelinuxx8664gcc.cmake | 2 +- 36 files changed, 225 insertions(+), 151 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e5d9e9f2f1..1eac6237005 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -457,6 +457,9 @@ install ( DIRECTORY OCDB install ( DIRECTORY QAref DESTINATION . PATTERN ".svn" EXCLUDE) +install ( DIRECTORY GRP + DESTINATION . + PATTERN ".svn" EXCLUDE) # # EOF diff --git a/EVE/alice-macros/clusters.C b/EVE/alice-macros/clusters.C index d4915be38e9..e3c52b5ed82 100644 --- a/EVE/alice-macros/clusters.C +++ b/EVE/alice-macros/clusters.C @@ -2,16 +2,17 @@ #include #include #include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "AliRunLoader.h" +#include "AliCluster.h" +#include "AliTracker.h" +#include "AliReconstruction.h" +#include "AliESDEvent.h" +#include "AliESDtrack.h" +#include "AliESDfriend.h" + +#include "AliITSRecoParam.h" #endif void clusters() diff --git a/EVE/alice-macros/emcal_digits.C b/EVE/alice-macros/emcal_digits.C index bed86d74ba8..6a513c3e965 100644 --- a/EVE/alice-macros/emcal_digits.C +++ b/EVE/alice-macros/emcal_digits.C @@ -7,23 +7,27 @@ * full copyright notice. * **************************************************************************/ #ifndef __CINT__ -#include -#include + +#include +#include #include #include #include #include -#include -#include -#include #include +#include +#include +#include + +#include #include #include #include #include #include -#include + +// #include #endif void emcal_digits() diff --git a/ITS/AliITSv11GeometrySSD.cxx b/ITS/AliITSv11GeometrySSD.cxx index 4775b20afcf..76c8557a336 100644 --- a/ITS/AliITSv11GeometrySSD.cxx +++ b/ITS/AliITSv11GeometrySSD.cxx @@ -1844,14 +1844,14 @@ TList* AliITSv11GeometrySSD::GetCarbonFiberSupportList(){ //////////////////// vertexposition[0][0] = new TVector3(); vertexposition[0][1] = new TVector3(fgkCarbonFiberSupportXAxisLength, - fgkCarbonFiberSupportYAxisLength); + fgkCarbonFiberSupportYAxisLength, 0); vertexposition[0][2] = new TVector3(carbonfibersupportxaxisEdgeproj, carbonfibersupportxaxisEdgeproj - * TMath::Tan(theta)); + * TMath::Tan(theta), 0); vertexposition[0][3] = new TVector3(fgkCarbonFiberSupportXAxisLength - carbonfibersupportxaxisEdgeproj, fgkCarbonFiberSupportYAxisLength - - vertexposition[0][2]->Y()); + - vertexposition[0][2]->Y(), 0); //////////////////////////////////////////////////// //Setting the parameters for Isometry Transformation //////////////////////////////////////////////////// @@ -1862,7 +1862,7 @@ TList* AliITSv11GeometrySSD::GetCarbonFiberSupportList(){ param[0] = 0., param[1] = 1., param[2] = 0., param[3] = -symmetryplaneposition; for(Int_t j=0; jX(), - (GetReflection(vertexposition[0][j],param))->Y()); + (GetReflection(vertexposition[0][j],param))->Y(), 0); const char* carbonfibersupportshapename[kshapesnumber] = {"CarbonFiberSupportShape1","CarbonFiberSupportShape2"}; const char* carbonfibersupportname[kshapesnumber] = @@ -1911,10 +1911,10 @@ TGeoVolume* AliITSv11GeometrySSD::GetCarbonFiberJunction(Double_t width){ * TMath::DegToRad()), fgkCarbonFiberJunctionEdge[0] * TMath::Sin(fgkCarbonFiberJunctionAngle[0] - * TMath::DegToRad())); + * TMath::DegToRad()), 0); vertex[4] = new TVector3(fgkCarbonFiberJunctionLength-fgkSSDTolerance, - fgkCarbonFiberJunctionEdge[1]); - vertex[5] = new TVector3(fgkCarbonFiberJunctionLength-fgkSSDTolerance); + fgkCarbonFiberJunctionEdge[1], 0); + vertex[5] = new TVector3(fgkCarbonFiberJunctionLength-fgkSSDTolerance, 0, 0); vertex[1] = GetReflection(vertex[5],reflectionparam); vertex[2] = GetReflection(vertex[4],reflectionparam); Double_t xvertexpoints[6], yvertexpoints[6]; @@ -1946,24 +1946,24 @@ TList* AliITSv11GeometrySSD::GetCarbonFiberLowerSupportList(){ for(Int_t i = 0; iX(), vertexposition[0][0]->X()*TMath::Tan(theta) - + fgkCarbonFiberLowerSupportVolumePosition[0]); + + fgkCarbonFiberLowerSupportVolumePosition[0], 0); vertexposition[1][1] = new TVector3(vertexposition[0][1]->X(), vertexposition[0][1]->X()*TMath::Tan(theta) - + fgkCarbonFiberLowerSupportVolumePosition[0]); - vertexposition[1][2] = new TVector3(0.,fgkCarbonFiberLowerSupportVolumePosition[0]); + + fgkCarbonFiberLowerSupportVolumePosition[0], 0); + vertexposition[1][2] = new TVector3(0.,fgkCarbonFiberLowerSupportVolumePosition[0], 0); vertexposition[1][3] = new TVector3(fgkCarbonFiberTriangleLength, - fgkCarbonFiberLowerSupportVolumePosition[1]); + fgkCarbonFiberLowerSupportVolumePosition[1], 0); const char* carbonfiberlowersupportshapename[kshapesnumber] = {"CarbonFiberLowerSupportShape1","CarbonFiberLowerSupportShape2"}; const char* carbonfiberlowersupportname[kshapesnumber] = @@ -2002,11 +2002,11 @@ TGeoVolume* AliITSv11GeometrySSD::GetSSDSensorSupport(Double_t length, Double_t TGeoXtru* ssdsensorsupportshape = new TGeoXtru(2); TVector3* vertexposition[kvertexnumber]; vertexposition[0] = new TVector3(); - vertexposition[1] = new TVector3(0.0,length); - vertexposition[2] = new TVector3(thickness[1],vertexposition[1]->Y()); - vertexposition[3] = new TVector3(vertexposition[2]->X(),thickness[0]); - vertexposition[4] = new TVector3(height,vertexposition[3]->Y()); - vertexposition[5] = new TVector3(vertexposition[4]->X()); + vertexposition[1] = new TVector3(0.0,length,0); + vertexposition[2] = new TVector3(thickness[1],vertexposition[1]->Y(),0); + vertexposition[3] = new TVector3(vertexposition[2]->X(),thickness[0],0); + vertexposition[4] = new TVector3(height,vertexposition[3]->Y(),0); + vertexposition[5] = new TVector3(vertexposition[4]->X(),0,0); Double_t xvertexpoints[6], yvertexpoints[6]; for(Int_t i=0; iX(), @@ -2042,20 +2042,20 @@ TGeoVolume* AliITSv11GeometrySSD::GetCoolingTubeSupport(Int_t nedges){ Double_t router = fgkCoolingTubeSupportRmin/CosD(phi/nedges); // Recalc inner radius so that tube fits inside vertexposition[0] = new TVector3(router*CosD(angle), - router*SinD(angle)); + router*SinD(angle), 0); vertexposition[1] = new TVector3(fgkCoolingTubeSupportRmax*CosD(angle), - fgkCoolingTubeSupportRmax*SinD(angle)); + fgkCoolingTubeSupportRmax*SinD(angle),0); vertexposition[2] = new TVector3(vertexposition[1]->X(), - fgkCoolingTubeSupportRmax); + fgkCoolingTubeSupportRmax, 0); vertexposition[3] = new TVector3(-vertexposition[1]->X(), - fgkCoolingTubeSupportRmax); + fgkCoolingTubeSupportRmax, 0); vertexposition[4] = new TVector3(-vertexposition[1]->X(), - vertexposition[1]->Y()); + vertexposition[1]->Y(), 0); for(Int_t i=0; iX(),-virtualvertex[0]->Y()); - virtualvertex[2] = new TVector3(-virtualvertex[0]->X(),virtualvertex[1]->Y()); - virtualvertex[3] = new TVector3(virtualvertex[2]->X(),0.5*fgkCoolingTubeSupportHeight); - virtualvertex[4] = new TVector3(virtualvertex[3]->X()+boxlength,virtualvertex[3]->Y()); - virtualvertex[5] = new TVector3(virtualvertex[4]->X(),-virtualvertex[4]->Y()); - virtualvertex[6] = new TVector3(virtualvertex[3]->X(),-virtualvertex[3]->Y()); - virtualvertex[7] = new TVector3(virtualvertex[2]->X(),-virtualvertex[2]->Y()); + virtualvertex[0] = new TVector3(-fgkCoolingTubeSupportRmax,-fgkCoolingTubeSupportRmax, 0); + virtualvertex[1] = new TVector3(virtualvertex[0]->X(),-virtualvertex[0]->Y(),0); + virtualvertex[2] = new TVector3(-virtualvertex[0]->X(),virtualvertex[1]->Y(),0); + virtualvertex[3] = new TVector3(virtualvertex[2]->X(),0.5*fgkCoolingTubeSupportHeight,0); + virtualvertex[4] = new TVector3(virtualvertex[3]->X()+boxlength,virtualvertex[3]->Y(),0); + virtualvertex[5] = new TVector3(virtualvertex[4]->X(),-virtualvertex[4]->Y(),0); + virtualvertex[6] = new TVector3(virtualvertex[3]->X(),-virtualvertex[3]->Y(),0); + virtualvertex[7] = new TVector3(virtualvertex[2]->X(),-virtualvertex[2]->Y(),0); Double_t xmothervertex[kvirtualvertexnumber], ymothervertex[kvirtualvertexnumber]; for(Int_t i=0; i< kvirtualvertexnumber; i++) xmothervertex[i] = virtualvertex[i]->X(), @@ -2535,7 +2535,7 @@ TGeoVolume* AliITSv11GeometrySSD::GetCoolingBlockSystem(){ coolingblocktransvector = new TVector3(fgkCoolingTubeSeparation, fgkSSDSensorLength - 2.*fgkSSDModuleStiffenerPosition[1] - - fgkSSDCoolingBlockWidth); + - fgkSSDCoolingBlockWidth, 0); const Int_t kcoolingblocktransnumber = 2; const Int_t kcoolingblocknumber = 4; TGeoHMatrix* coolingblockmatrix[kcoolingblocknumber]; @@ -2701,14 +2701,14 @@ TGeoVolume* AliITSv11GeometrySSD::GetSSDEndFlex(){ TVector3* referencetrans[karcnumber]; referencetrans[0] = new TVector3(ssdflexboxlength*CosD(2.*fgkSSDFlexAngle) + radius[0]*SinD(2.*fgkSSDFlexAngle), - radius[0]); + radius[0], 0); referencetrans[1] = new TVector3(referencetrans[0]->X() + fgkSSDFlexLength[2], - - fgkSSDStiffenerHeight); + - fgkSSDStiffenerHeight, 0); for(Int_t i=0; iX(),transvector[i]->Y()); - vertex[i][1] = new TVector3(transvector[i+1]->X(),transvector[i+1]->Y()); + vertex[i][0] = new TVector3(transvector[i]->X(),transvector[i]->Y(),0); + vertex[i][1] = new TVector3(transvector[i+1]->X(),transvector[i+1]->Y(),0); for(Int_t j=0; jX()*ratioradius[0][i+1], - vertexposition[j]->Y()*ratioradius[0][i+1]); + vertexposition[j]->Y()*ratioradius[0][i+1], 0); vertex[i][j+2]->RotateZ(referenceangle[0]); *vertex[i][j+2] += *referencetrans[0]; vertex[i][4*(knedges+1)-j+1] = new TVector3(vertexposition[j]->X()*ratioradius[0][i], - vertexposition[j]->Y()*ratioradius[0][i]); + vertexposition[j]->Y()*ratioradius[0][i], 0); vertex[i][4*(knedges+1)-j+1]->RotateZ(referenceangle[0]); *vertex[i][4*(knedges+1)-j+1] += *referencetrans[0]; } else{ vertex[i][j+2] = new TVector3(vertexposition[j]->X()*ratioradius[1][i+1], - vertexposition[j]->Y()*ratioradius[1][i+1]); + vertexposition[j]->Y()*ratioradius[1][i+1],0); vertex[i][j+2]->RotateZ(referenceangle[1]); *vertex[i][j+2] += *referencetrans[1]; vertex[i][4*(knedges+1)-j+1] = new TVector3(vertexposition[j]->X()*ratioradius[1][i], - vertexposition[j]->Y()*ratioradius[1][i]); + vertexposition[j]->Y()*ratioradius[1][i], + 0); vertex[i][4*(knedges+1)-j+1]->RotateZ(referenceangle[1]); *vertex[i][4*(knedges+1)-j+1] += *referencetrans[1]; } @@ -2898,7 +2899,7 @@ TGeoVolume* AliITSv11GeometrySSD::GetSSDMountingBlock(){ screwvertex[i] = new TVector3(fgkSSDMountingBlockScrewHoleRadius[0] *CosD(phi0+i*deltaphi), fgkSSDMountingBlockScrewHoleRadius[0] - *SinD(phi0+i*deltaphi)); + *SinD(phi0+i*deltaphi), 0); Double_t xscrewvertex[kscrewvertexnumber+6]; Double_t yscrewvertex[kscrewvertexnumber+6]; xscrewvertex[0] = - fgkSSDMountingBlockScrewHoleRadius[0]; @@ -3238,25 +3239,25 @@ TGeoVolume* AliITSv11GeometrySSD::GetSSDCoolingBlock(Int_t nedges){ // Vertex Positioning for TGeoXTru /////////////////////////////////////// TVector3** vertexposition = new TVector3*[2*kvertexnumber+nedges+1]; - vertexposition[0] = new TVector3(0.0,0.0); - vertexposition[1] = new TVector3(0.0,fgkSSDCoolingBlockHeight[1]); + vertexposition[0] = new TVector3(0.0,0.0, 0.); + vertexposition[1] = new TVector3(0.0,fgkSSDCoolingBlockHeight[1],0); vertexposition[2] = new TVector3(fgkSSDCoolingBlockHoleLength[1], - vertexposition[1]->Y()); + vertexposition[1]->Y(),0); vertexposition[3] = new TVector3(vertexposition[2]->X(), - vertexposition[2]->Y()+fgkSSDCoolingBlockHeight[2]); - vertexposition[4] = new TVector3(vertexposition[1]->X(),vertexposition[3]->Y()); + vertexposition[2]->Y()+fgkSSDCoolingBlockHeight[2],0); + vertexposition[4] = new TVector3(vertexposition[1]->X(),vertexposition[3]->Y(),0); vertexposition[5] = new TVector3(vertexposition[4]->X(), - + vertexposition[3]->Y()+fgkSSDCoolingBlockHoleRadius[1]); + + vertexposition[3]->Y()+fgkSSDCoolingBlockHoleRadius[1],0); vertexposition[6] = new TVector3(Xfrom2Points(vertexposition[5]->X(), vertexposition[5]->Y(),0.5*(fgkSSDCoolingBlockLength - fgkSSDCoolingBlockHoleLength[0] - 4.*fgkSSDCoolingBlockHoleRadius[1]), fgkSSDCoolingBlockHeight[0] - fgkSSDCoolingBlockHoleRadius[1], - fgkSSDCoolingBlockHeight[0]),fgkSSDCoolingBlockHeight[0]); + fgkSSDCoolingBlockHeight[0]),fgkSSDCoolingBlockHeight[0], 0); vertexposition[7] = new TVector3(0.5*(fgkSSDCoolingBlockLength - fgkSSDCoolingBlockHoleLength[0]), - vertexposition[6]->Y()); + vertexposition[6]->Y(), 0); Double_t alpha = TMath::ACos(0.5*fgkSSDCoolingBlockHoleLength[0] / fgkSSDCoolingBlockHoleRadius[0])*TMath::RadToDeg(); Double_t phi = 180.-alpha; @@ -3264,10 +3265,11 @@ TGeoVolume* AliITSv11GeometrySSD::GetSSDCoolingBlock(Int_t nedges){ Double_t deltapsi = psi/nedges; Double_t radius = fgkSSDCoolingBlockHoleRadius[0]/CosD(0.5*deltapsi); TVector3* transvector = new TVector3(0.5*fgkSSDCoolingBlockLength, - fgkSSDCoolingBlockHoleCenter); + fgkSSDCoolingBlockHoleCenter, 0); for(Int_t i=0; iX(), vertexposition[i][2*(nedges+1)+2]->Y() - - fgkSSDChipCablesHeight[i]); + - fgkSSDChipCablesHeight[i], 0); for(Int_t j=0; jSetX(ssdchipcablesradius[0]*CosD(angle)); @@ -3383,14 +3385,14 @@ void AliITSv11GeometrySSD::GetSSDChipCables(TGeoVolume *&cableL, TGeoVolume *&ca new TVector3(*vertex+*transvector[i]); vertexposition[1][(nedges+1)*i+j+2] = new TVector3(vertex->X()*ratio[2*i]+transvector[i]->X(), - vertex->Y()*ratio[2*i]+transvector[i]->Y()); + vertex->Y()*ratio[2*i]+transvector[i]->Y(), 0); vertexposition[0][(4-i)*(nedges+1)+4-j-1] = new TVector3(*vertexposition[1][(nedges+1)*i+j+2]); vertexposition[1][(4-i)*(nedges+1)+4-j-1] = new TVector3(vertex->X()*ratio[2*i+1] + transvector[i]->X(), vertex->Y()*ratio[2*i+1] - + transvector[i]->Y()); + + transvector[i]->Y(), 0); } } for(Int_t i=0; iX(), - laddercablesegmentvertexposition[i][2]->Y()); + laddercablesegmentvertexposition[i][2]->Y(), 0); } Double_t laddercablesegmentwidth[2][2] = {{fgkSSDFlexHeight[0],fgkSSDFlexHeight[0]}, {fgkSSDFlexHeight[1],fgkSSDFlexHeight[1]}}; @@ -4194,7 +4196,7 @@ void AliITSv11GeometrySSD::Layer6(TGeoVolume* moth){ for(Int_t i=0; iX()>mountingsupportedgevector[i]->X()) indexedge[i]++; vertexlist[i]->Add(vertex[i][j]); } @@ -4743,12 +4745,12 @@ void AliITSv11GeometrySSD::SetLadderSupport(Int_t nedges){ for(Int_t i=0; iY()); + ringsupportvertex[i][0]->Y(), 0); ringsupportvertex[i][2] = new TVector3(0.5*fgkSSDMountingBlockLength[0], - ringsupportvertex[i][1]->Y()); + ringsupportvertex[i][1]->Y(),0); ringsupportvertex[i][2]->RotateZ(theta[i]+phi[i]); for(Int_t j=1; jY()-fgkLadderSupportHeight)*CosD(90.0-j*angle), - (ringsupportvertex[i][0]->Y()-fgkLadderSupportHeight)*SinD(90.0-j*angle)); + (ringsupportvertex[i][0]->Y()-fgkLadderSupportHeight)*SinD(90.0-j*angle), 0); } } Double_t **xmothervertex = new Double_t*[fgklayernumber]; @@ -8042,8 +8044,8 @@ TGeoXtru* AliITSv11GeometrySSD::GetArcShape(Double_t phi, Double_t rmin, Double_t angle = 0.; for(Int_t i=0; iPt(); // pt of the particle if (pt < ptMin) continue; //check cuts - p = part->P(); + p.SetXYZ(part->Px(), part->Py(), part->Pz()); e = part->Energy(); // fill momentum array new ((*fMomentumArray)[goodTrack]) TLorentzVector(p.X(), p.Y(), p.Z(), e); diff --git a/MUON/CMakelibMUONrec.pkg b/MUON/CMakelibMUONrec.pkg index a9dc48465f7..a2479689797 100644 --- a/MUON/CMakelibMUONrec.pkg +++ b/MUON/CMakelibMUONrec.pkg @@ -89,4 +89,6 @@ set ( EXPORT AliMUONTrackParam.h AliMUONCDB.h AliMUONVTrackStore.h - AliMUONClusterStoreV2.h) + AliMUONClusterStoreV2.h + AliMUONQADataMakerRec.h + ) diff --git a/OADB/Makefile b/OADB/Makefile index 66ad06bab5d..358160233d6 100644 --- a/OADB/Makefile +++ b/OADB/Makefile @@ -1,6 +1,6 @@ PACKAGE = invalid-only-for-proof -include Makefile.arch +include $(ROOTSYS)/etc/Makefile.arch SRCS = $(wildcard *.cxx */*.cxx) HDRS = $(SRCS:.cxx=.h) @@ -13,6 +13,14 @@ endif ALICEINC = -I. +ifneq ($(ESD_INCLUDE),) + ALICEINC += -I../$(ESD_INCLUDE) +endif + +ifneq ($(AOD_INCLUDE),) + ALICEINC += -I../$(AOD_INCLUDE) +endif + ifneq ($(STEERBase_INCLUDE),) ALICEINC += -I../$(STEERBase_INCLUDE) endif @@ -26,11 +34,11 @@ ifneq ($(OADB_INCLUDE),) endif # only if no par file was loaded before -#ifeq ($(ALICEINC),-I.) +ifeq ($(ALICEINC),-I.) ifneq ($(ALICE_ROOT),) ALICEINC += -I$(ALICE_ROOT)/include endif -#endif +endif diff --git a/PWG/EMCAL/AliEMCALClusterParams.cxx b/PWG/EMCAL/AliEMCALClusterParams.cxx index ffff3a46c3a..efdc917cb0b 100644 --- a/PWG/EMCAL/AliEMCALClusterParams.cxx +++ b/PWG/EMCAL/AliEMCALClusterParams.cxx @@ -17,6 +17,9 @@ #include #include #include "AliEMCALClusterParams.h" +using std::endl; +using std::cout; +using std::cerr; ClassImp(AliEMCALClusterParams) diff --git a/PWG/FLOW/Base/AliFlowAnalysisWithMSP.cxx b/PWG/FLOW/Base/AliFlowAnalysisWithMSP.cxx index 1b33397ed94..ec33127253e 100644 --- a/PWG/FLOW/Base/AliFlowAnalysisWithMSP.cxx +++ b/PWG/FLOW/Base/AliFlowAnalysisWithMSP.cxx @@ -33,6 +33,9 @@ #include #include +using std::setw; +using std::setprecision; + AliFlowAnalysisWithMSP::AliFlowAnalysisWithMSP() : TNamed(), fHarmonic(2), fNUA(kFALSE), fUseCommonConstants(kFALSE), fBookCommonHistograms(kFALSE), fCommonHist(0), fQaComponents(0), @@ -519,7 +522,7 @@ void AliFlowAnalysisWithMSP::Print(const Option_t *opt)const double vn=0; double vnerror=0; - std::cout << setprecision(4); + std::cout << std::setprecision(4); Calculate(vn, vnerror, fAllStatistics, fPtUComponents, 0, 0); std::cout << "v" << fHarmonic << " for POI : " << setw(11) << vn << " +- " << setw(9) << vnerror << std::endl; Calculate(vn, vnerror, fAllStatistics, fPtUComponents, 0, 1); @@ -529,7 +532,7 @@ void AliFlowAnalysisWithMSP::Print(const Option_t *opt)const std::cout << std::endl; std::cout << "NUA terms: " << (fNUA?"(applied)":"(NOT applied)") << std::endl; - std::cout << setprecision(3); + std::cout << std::setprecision(3); const double ux=fPtUComponents->Average(0); // Average over all bins const double eux=TMath::Sqrt(fPtUComponents->Variance(0)); std::cout << " " << setw(12) << ux << " +- " << setw(12) << eux << (TMath::Abs(ux)<2*eux?" NOT significant ":" ") << std::endl; diff --git a/PWG/muondep/AliAnalysisTriggerScalers.cxx b/PWG/muondep/AliAnalysisTriggerScalers.cxx index a2bd9e9ef21..eeb832440df 100644 --- a/PWG/muondep/AliAnalysisTriggerScalers.cxx +++ b/PWG/muondep/AliAnalysisTriggerScalers.cxx @@ -97,7 +97,7 @@ #include "TBox.h" #include "TCanvas.h" #include "TText.h" - +using std::make_pair; ClassImp(AliAnalysisTriggerScalers) namespace { diff --git a/PWG/muondep/AliMuonAccEffSubmitter.cxx b/PWG/muondep/AliMuonAccEffSubmitter.cxx index b0f677137e9..a5b6610e06d 100644 --- a/PWG/muondep/AliMuonAccEffSubmitter.cxx +++ b/PWG/muondep/AliMuonAccEffSubmitter.cxx @@ -67,7 +67,8 @@ #include "TString.h" #include "TSystem.h" #include - +#include +using std::ifstream; namespace { Int_t splitLevel=10; diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx index 60d11f60201..30fd480be5e 100644 --- a/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx +++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx @@ -41,7 +41,9 @@ #include "AliMultiplicity.h" #include "AliCentrality.h" #include "AliAnalysisTaskDptDptCorrelations.h" - +using std::cout; +using std::endl; +using std::cerr; ClassImp(AliAnalysisTaskDptDptCorrelations) AliAnalysisTaskDptDptCorrelations::AliAnalysisTaskDptDptCorrelations() diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx index b72f61220ed..3d9d27e394b 100644 --- a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx +++ b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx @@ -40,6 +40,9 @@ #include "AliAnalysisTaskTriggeredBF.h" #include "AliBalancePsi.h" +using std::cout; +using std::endl; +using std::cerr; ClassImp(AliBalancePsi) diff --git a/PWGCF/EBYE/LRC/AliAnalysisTaskLRC.cxx b/PWGCF/EBYE/LRC/AliAnalysisTaskLRC.cxx index 2c7745a6565..2f45ff304dc 100644 --- a/PWGCF/EBYE/LRC/AliAnalysisTaskLRC.cxx +++ b/PWGCF/EBYE/LRC/AliAnalysisTaskLRC.cxx @@ -68,6 +68,9 @@ #include "TStopwatch.h" +using std::cout; +using std::endl; +using std::cerr; diff --git a/PWGCF/EBYE/LRC/AliLRCProcess.cxx b/PWGCF/EBYE/LRC/AliLRCProcess.cxx index bbb8da66aac..82470731069 100644 --- a/PWGCF/EBYE/LRC/AliLRCProcess.cxx +++ b/PWGCF/EBYE/LRC/AliLRCProcess.cxx @@ -29,6 +29,9 @@ #include "TString.h" #include "TMath.h" //#include "TClonesArray.h" +using std::cout; +using std::endl; +using std::cerr; //#include //for particle mass only ClassImp(AliLRCProcess) diff --git a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEParticleRatioFluctuationTask.cxx b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEParticleRatioFluctuationTask.cxx index 62a63229e2a..145cdb2eb18 100644 --- a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEParticleRatioFluctuationTask.cxx +++ b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEParticleRatioFluctuationTask.cxx @@ -48,6 +48,9 @@ #include "AliHelperPID.h" #include "AliEbyEParticleRatioFluctuationTask.h" +using std::cout; +using std::endl; +using std::cerr; ClassImp(AliEbyEParticleRatioFluctuationTask) diff --git a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx index d6c46fa5bf9..f4d1e90dc81 100644 --- a/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx +++ b/PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx @@ -30,6 +30,10 @@ #include "AliV0vertexer.h" #include "AliVCluster.h" +#include +using std::cout; +using std::endl; + ClassImp(AliAnalysisTaskEMCALIsoPhoton) //________________________________________________________________________ diff --git a/PWGHF/CMakelibPWGHFvertexingHF.pkg b/PWGHF/CMakelibPWGHFvertexingHF.pkg index 2281322e49f..338f461812f 100644 --- a/PWGHF/CMakelibPWGHFvertexingHF.pkg +++ b/PWGHF/CMakelibPWGHFvertexingHF.pkg @@ -89,7 +89,11 @@ set ( DHDR PWGHFvertexingHFLinkDef.h) set ( EINCLUDE PWGHF/vertexingHF CORRFW STEER/AOD STEER/ESD STEER/STEERBase PWG/FLOW/Base PWG/FLOW/Tasks) -install ( FILES vertexingHF/AliAODRecoDecayHF.h vertexingHF/AliAODRecoDecayHF2Prong.h +install ( FILES vertexingHF/AliAODRecoDecayHF.h + vertexingHF/AliAODRecoDecayHF2Prong.h + vertexingHF/AddD2HTrain.C + vertexingHF/ConfigVertexingHF.C + vertexingHF/ConfigVertexingHF_highmult.C DESTINATION PWGHF/vertexingHF/ ) install ( DIRECTORY vertexingHF/macros diff --git a/PWGHF/hfe/AliAnalysisTaskHFECal.cxx b/PWGHF/hfe/AliAnalysisTaskHFECal.cxx index f905a7de3b1..13403a5f283 100644 --- a/PWGHF/hfe/AliAnalysisTaskHFECal.cxx +++ b/PWGHF/hfe/AliAnalysisTaskHFECal.cxx @@ -82,6 +82,8 @@ #include "AliCentrality.h" +using namespace std; + ClassImp(AliAnalysisTaskHFECal) //________________________________________________________________________ AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name) diff --git a/PWGJE/AliAnalysisTaskFragmentationFunction.cxx b/PWGJE/AliAnalysisTaskFragmentationFunction.cxx index b67d9e225b0..d814de587a7 100644 --- a/PWGJE/AliAnalysisTaskFragmentationFunction.cxx +++ b/PWGJE/AliAnalysisTaskFragmentationFunction.cxx @@ -51,6 +51,9 @@ #include "AliVEvent.h" #include "AliAnalysisTaskFragmentationFunction.h" +using std::cout; +using std::endl; +using std::cerr; ClassImp(AliAnalysisTaskFragmentationFunction) diff --git a/PWGJE/AliFragmentationFunctionCorrections.cxx b/PWGJE/AliFragmentationFunctionCorrections.cxx index 2678c24f475..3f2b4b09ea6 100644 --- a/PWGJE/AliFragmentationFunctionCorrections.cxx +++ b/PWGJE/AliFragmentationFunctionCorrections.cxx @@ -31,6 +31,10 @@ #include "AliFragmentationFunctionCorrections.h" #include // OB TEST!!! #include +using std::cout; +using std::endl; +using std::cerr; +using std::fstream; /////////////////////////////////////////////////////////////////////////////// // // diff --git a/PWGJE/CMakelibPWGJE.pkg b/PWGJE/CMakelibPWGJE.pkg index 9705999a5a9..8d4acaa88f9 100644 --- a/PWGJE/CMakelibPWGJE.pkg +++ b/PWGJE/CMakelibPWGJE.pkg @@ -60,3 +60,9 @@ set ( DHDR PWGJELinkDef.h) string ( REPLACE ".cxx" ".h" EXPORT "${SRCS}" ) set ( EINCLUDE ANALYSIS JETAN JETAN/fastjet CORRFW PWGJE PWG/Tools PWGCF/Correlations/Base STEER/AOD STEER/ESD STEER/STEERBase) + +install (DIRECTORY macros + DESTINATION PWGJE + PATTERN ".svn" EXCLUDE + PATTERN ".d" EXCLUDE + PATTERN ".so" EXCLUDE) diff --git a/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx b/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx index 5699470972a..4ff5eef7a80 100644 --- a/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx +++ b/PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx @@ -24,6 +24,9 @@ #include "AliVCluster.h" #include "AliVEvent.h" #include "AliVParticle.h" +using std::cout; +using std::endl; +using std::cerr; ClassImp(AliEmcalJetTask) diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx index 6d5d755ecc2..24251095cf3 100644 --- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx +++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx @@ -42,7 +42,7 @@ #include "AliAnalysisTaskChargedJetsPA.h" - +using std::min; //TODO: Not accessing the particles when using MC //TODO: FillHistogram can be done better with virtual TH1(?) ClassImp(AliAnalysisTaskChargedJetsPA) diff --git a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadCorQA.cxx b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadCorQA.cxx index da1df0b9701..e6c3c5352d3 100644 --- a/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadCorQA.cxx +++ b/PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadCorQA.cxx @@ -27,6 +27,7 @@ #include "AliEmcalParticle.h" #include "AliPicoTrack.h" #include "AliEMCALGeometry.h" +using std::vector; ClassImp(AliAnalysisTaskEmcalJetHadCorQA) diff --git a/PWGPP/TRD/macros/AddTRDcheckPID.C b/PWGPP/TRD/macros/AddTRDcheckPID.C index f181016655c..864e3db8d2b 100644 --- a/PWGPP/TRD/macros/AddTRDcheckPID.C +++ b/PWGPP/TRD/macros/AddTRDcheckPID.C @@ -13,7 +13,8 @@ void AddTRDcheckPID(AliAnalysisManager *mgr, Int_t map, AliAnalysisDataContainer **ci, AliAnalysisDataContainer **co) { - Info("AddTRDcheckPID", Form("[0]=\"%s\" [1]=\"%s\" [2]=\"%s\"", ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName())); + Info("AddTRDcheckPID", "[0]=\"%s\" [1]=\"%s\" [2]=\"%s\"", + ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName()); AliTRDcheckPID *pid(NULL); mgr->AddTask(pid = new AliTRDcheckPID((char*)"TRDcheckPID")); diff --git a/PWGPP/TRD/macros/AddTRDv0Monitor.C b/PWGPP/TRD/macros/AddTRDv0Monitor.C index b9f2e96274e..776be958bf1 100644 --- a/PWGPP/TRD/macros/AddTRDv0Monitor.C +++ b/PWGPP/TRD/macros/AddTRDv0Monitor.C @@ -9,7 +9,8 @@ void AddTRDv0Monitor(AliAnalysisManager *mgr, Int_t /*map*/, AliAnalysisDataContainer **ci/*, AliAnalysisDataContainer **co*/) { - Info("AddTRDv0Monitor", Form("[0]=\"%s\" [1]=\"%s\" [2]=\"%s\" [3]=\"%s\"", ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName(), ci[3]->GetName())); + Info("AddTRDv0Monitor", "[0]=\"%s\" [1]=\"%s\" [2]=\"%s\" [3]=\"%s\"", + ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName(), ci[3]->GetName()); AliTRDv0Monitor *v0Mon(NULL);; mgr->AddTask(v0Mon = new AliTRDv0Monitor((char*)"TRDv0Monitor")); diff --git a/STEER/STEER/AliAlignmentTracks.cxx b/STEER/STEER/AliAlignmentTracks.cxx index 11f5760d7f9..3968b419b34 100644 --- a/STEER/STEER/AliAlignmentTracks.cxx +++ b/STEER/STEER/AliAlignmentTracks.cxx @@ -33,8 +33,9 @@ #include "AliTrackFitterRieman.h" #include "AliTrackResidualsChi2.h" #include "AliESDEvent.h" -#include "AliESDfriend.h" #include "AliLog.h" +#include "AliESDfriend.h" + ClassImp(AliAlignmentTracks) //______________________________________________________________________________ diff --git a/STRUCT/AliPIPEv3.cxx b/STRUCT/AliPIPEv3.cxx index f4db64ab01f..5095369bcde 100644 --- a/STRUCT/AliPIPEv3.cxx +++ b/STRUCT/AliPIPEv3.cxx @@ -578,7 +578,8 @@ void AliPIPEv3::CreateGeometry() z = -shCp3Mo->GetZ(0); shCp3Mo->DefineSection(11, z, 0., kCP3FlangeRo); // - TGeoVolume* voCp3Mo = new TGeoVolume("CP3MO", shCp3Mo, kMedAir); + // TGeoVolume* voCp3Mo = new TGeoVolume("CP3MO", shCp3Mo, kMedAir); + TGeoVolume* voCp3Mo = new TGeoVolumeAssembly("CP3MO"); voCp3Mo->SetVisibility(0); TGeoVolumeAssembly* voCp3 = new TGeoVolumeAssembly("Cp3"); voCp3->AddNode(voCp3Mo, 1, gGeoIdentity); diff --git a/TEvtGen/EvtGenModels/EvtPyGaGa.cxx b/TEvtGen/EvtGenModels/EvtPyGaGa.cxx index 904386710c6..4d0ccbd12c4 100644 --- a/TEvtGen/EvtGenModels/EvtPyGaGa.cxx +++ b/TEvtGen/EvtGenModels/EvtPyGaGa.cxx @@ -34,12 +34,12 @@ extern "C" { extern void pystat_(int &); + extern struct + { + int dc[18]; + } decaych_; } -// extern struct -// { -// int dc[18]; -// } decaych_; EvtPyGaGa::~EvtPyGaGa() { @@ -61,8 +61,8 @@ void EvtPyGaGa::init() { // check that there are 1 argument checkNArg(0); - // for( int i=0; i<18; i++) - // decaych_.dc[i]=0; + for( int i=0; i<18; i++) + decaych_.dc[i]=0; } void EvtPyGaGa::initProbMax() diff --git a/TEvtGen/EvtGenModels/EvtPycont.cxx b/TEvtGen/EvtGenModels/EvtPycont.cxx index 6eb708e13af..3a94c00bf69 100644 --- a/TEvtGen/EvtGenModels/EvtPycont.cxx +++ b/TEvtGen/EvtGenModels/EvtPycont.cxx @@ -34,12 +34,12 @@ using std::endl; extern "C" { extern void pystat_(int &); + extern struct + { + int dc[18]; + } decaych_; } -// extern struct -// { -// int dc[18]; -// } decaych_; EvtPycont::~EvtPycont() { @@ -68,28 +68,28 @@ void EvtPycont::init() } checkNArg(0,12); - // for( int i=0; i<18; i++) - // decaych_.dc[i]=0; - // if ( getNArg() == 12 ) { - // decaych_.dc[0]=(int)getArg(0); - // decaych_.dc[1]=(int)getArg(1); - // decaych_.dc[2]=(int)getArg(2); - // decaych_.dc[3]=(int)getArg(3); - // decaych_.dc[4]=(int)getArg(4); - // decaych_.dc[5]=(int)getArg(5); - // decaych_.dc[10]=(int)getArg(6); - // decaych_.dc[11]=(int)getArg(7); - // decaych_.dc[12]=(int)getArg(8); - // decaych_.dc[13]=(int)getArg(9); - // decaych_.dc[14]=(int)getArg(10); - // decaych_.dc[15]=(int)getArg(11); - // } - // else{ - // decaych_.dc[0]=1; - // decaych_.dc[1]=1; - // decaych_.dc[2]=1; - // decaych_.dc[3]=1; - // } + for( int i=0; i<18; i++) + decaych_.dc[i]=0; + if ( getNArg() == 12 ) { + decaych_.dc[0]=(int)getArg(0); + decaych_.dc[1]=(int)getArg(1); + decaych_.dc[2]=(int)getArg(2); + decaych_.dc[3]=(int)getArg(3); + decaych_.dc[4]=(int)getArg(4); + decaych_.dc[5]=(int)getArg(5); + decaych_.dc[10]=(int)getArg(6); + decaych_.dc[11]=(int)getArg(7); + decaych_.dc[12]=(int)getArg(8); + decaych_.dc[13]=(int)getArg(9); + decaych_.dc[14]=(int)getArg(10); + decaych_.dc[15]=(int)getArg(11); + } + else{ + decaych_.dc[0]=1; + decaych_.dc[1]=1; + decaych_.dc[2]=1; + decaych_.dc[3]=1; + } } diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx index 1048be29092..86fcf36506e 100644 --- a/TOF/AliTOF.cxx +++ b/TOF/AliTOF.cxx @@ -68,9 +68,10 @@ class AliTOFcluster; -extern TROOT *gROOT; +// extern TROOT *gROOT; +// extern TVirtualMC *gMC; -extern AliRun *gAlice; +// extern AliRun *gAlice; ClassImp(AliTOF) diff --git a/TOF/AliTOFv6T0.cxx b/TOF/AliTOFv6T0.cxx index 9a8f6910b8e..4c99f6889c2 100644 --- a/TOF/AliTOFv6T0.cxx +++ b/TOF/AliTOFv6T0.cxx @@ -109,9 +109,10 @@ Revision 0.1 2007 March G. Cara Romeo and A. De Caro #include "AliTOFGeometry.h" #include "AliTOFv6T0.h" -extern TGeoManager *gGeoManager; +// extern TVirtualMC *gMC; +// extern TGeoManager *gGeoManager; -extern AliRun *gAlice; +// extern AliRun *gAlice; ClassImp(AliTOFv6T0) diff --git a/TRD/AliTRDgtuTMU.cxx b/TRD/AliTRDgtuTMU.cxx index 3110a8925c1..8a333da3b2b 100644 --- a/TRD/AliTRDgtuTMU.cxx +++ b/TRD/AliTRDgtuTMU.cxx @@ -658,14 +658,14 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks) AliTRDtrackGTU **trkInRefLayer = new AliTRDtrackGTU*[fGtuParam->GetNRefLayers()]; - Bool_t done = kFALSE; + // Bool_t done = kFALSE; Int_t minIdx = 0; AliTRDtrackGTU *trkStage0 = 0x0; for (Int_t zch = 0; zch < fGtuParam->GetNZChannels(); zch++) { // ----- Merging and Unification in Reflayers (seed_merger) ----- do { - done = kTRUE; + // done = kTRUE; trkStage0 = 0x0; for (Int_t refLayerIdx = 0; refLayerIdx < fGtuParam->GetNRefLayers(); refLayerIdx++) { trkInRefLayer[refLayerIdx] = (AliTRDtrackGTU*) fTracks[zch][refLayerIdx].First(); @@ -675,13 +675,13 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks) else if (trkStage0 == 0x0 ) { trkStage0 = trkInRefLayer[refLayerIdx]; minIdx = refLayerIdx; - done = kFALSE; + // done = kFALSE; } else if (trkInRefLayer[refLayerIdx]->GetZSubChannel() < trkStage0->GetZSubChannel() || (trkInRefLayer[refLayerIdx]->GetZSubChannel() == trkStage0->GetZSubChannel() && trkInRefLayer[refLayerIdx]->GetYapprox() < trkStage0->GetYapprox()) ) { minIdx = refLayerIdx; trkStage0 = trkInRefLayer[refLayerIdx]; - done = kFALSE; + // done = kFALSE; } } if (!trkStage0) @@ -723,7 +723,7 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks) // ----- Merging in zchannels - 1st stage ----- do { - done = kTRUE; + // done = kTRUE; trkStage0 = 0x0; for (Int_t zch = fGtuParam->GetNZChannels() - 1; zch > -1; zch--) { AliTRDtrackGTU *trk = (AliTRDtrackGTU*) tracksRefUnique[zch]->First(); @@ -733,13 +733,13 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks) else if (trkStage0 == 0x0 ) { trkStage0 = trk; minIdx = zch; - done = kFALSE; + // done = kFALSE; } else if ( ((trk->GetZChannel() + 3 * trk->GetZSubChannel()) / 2 - 1) < ((trkStage0->GetZChannel() + 3 * trkStage0->GetZSubChannel()) / 2 -1 ) || (((trk->GetZChannel() + 3 * trk->GetZSubChannel()) / 2 - 1) == ((trkStage0->GetZChannel() + 3 * trkStage0->GetZSubChannel()) / 2 -1 ) && (trk->GetYapprox() < trkStage0->GetYapprox()) ) ) { minIdx = zch; trkStage0 = trk; - done = kFALSE; + // done = kFALSE; } } @@ -808,7 +808,7 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks) // ----- Merging in zchanels - 2nd stage ----- do { - done = kTRUE; + // done = kTRUE; trkStage0 = 0x0; for (Int_t i = 1; i >= 0; i--) { AliTRDtrackGTU *trk = (AliTRDtrackGTU*) tracksZSplitted[i]->First(); @@ -818,13 +818,13 @@ Bool_t AliTRDgtuTMU::RunTrackMerging(TList* ListOfTracks) else if (trkStage0 == 0x0 ) { trkStage0 = trk; minIdx = i; - done = kFALSE; + // done = kFALSE; } else if ( (((trk->GetZChannel() + 3 * (trk->GetZSubChannel() - 1)) / 2) < ((trkStage0->GetZChannel() + 3 * (trkStage0->GetZSubChannel() - 1)) / 2)) || ((((trk->GetZChannel() + 3 * (trk->GetZSubChannel() - 1)) / 2) == ((trkStage0->GetZChannel() + 3 * (trkStage0->GetZSubChannel() - 1)) / 2)) && (trk->GetYapprox() < trkStage0->GetYapprox()) ) ) { minIdx = i; trkStage0 = trk; - done = kFALSE; + // done = kFALSE; } } diff --git a/cmake/CMakelinuxx8664gcc.cmake b/cmake/CMakelinuxx8664gcc.cmake index 74413fcc8f8..c1f0e2848cb 100644 --- a/cmake/CMakelinuxx8664gcc.cmake +++ b/cmake/CMakelinuxx8664gcc.cmake @@ -102,7 +102,7 @@ if(${CMAKE_Fortran_COMPILER} MATCHES "g95") elseif(${CMAKE_Fortran_COMPILER} MATCHES "gfortran") - set(FFLAGS "-DFORTRAN_GFORTRAN ${FFLAGS}") + set(FFLAGS "-DFORTRAN_GFORTRAN ${FFLAGS} -fPIC") execute_process(COMMAND ${CMAKE_Fortran_COMPILER} -print-file-name=libgfortran.so OUTPUT_VARIABLE _shlib OUTPUT_STRIP_TRAILING_WHITESPACE) -- 2.43.0