#101318: Patch for various problems in AliROOT
authorsvnbits <svnbits@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 30 Apr 2013 12:18:57 +0000 (12:18 +0000)
committersvnbits <svnbits@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 30 Apr 2013 12:18:57 +0000 (12:18 +0000)
Patch to fix various problems in AliROOT - mainly missing using std::...;
missing installation of data files, wrong inclusion of Makefile.arch, etc.

Christian

36 files changed:
CMakeLists.txt
EVE/alice-macros/clusters.C
EVE/alice-macros/emcal_digits.C
ITS/AliITSv11GeometrySSD.cxx
ITS/CMakelibITSrec.pkg
JETAN/AliJetMCReader.cxx
MUON/CMakelibMUONrec.pkg
OADB/Makefile
PWG/EMCAL/AliEMCALClusterParams.cxx
PWG/FLOW/Base/AliFlowAnalysisWithMSP.cxx
PWG/muondep/AliAnalysisTriggerScalers.cxx
PWG/muondep/AliMuonAccEffSubmitter.cxx
PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx
PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
PWGCF/EBYE/LRC/AliAnalysisTaskLRC.cxx
PWGCF/EBYE/LRC/AliLRCProcess.cxx
PWGCF/EBYE/PIDFluctuation/task/AliEbyEParticleRatioFluctuationTask.cxx
PWGGA/EMCALTasks/AliAnalysisTaskEMCALIsoPhoton.cxx
PWGHF/CMakelibPWGHFvertexingHF.pkg
PWGHF/hfe/AliAnalysisTaskHFECal.cxx
PWGJE/AliAnalysisTaskFragmentationFunction.cxx
PWGJE/AliFragmentationFunctionCorrections.cxx
PWGJE/CMakelibPWGJE.pkg
PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadCorQA.cxx
PWGPP/TRD/macros/AddTRDcheckPID.C
PWGPP/TRD/macros/AddTRDv0Monitor.C
STEER/STEER/AliAlignmentTracks.cxx
STRUCT/AliPIPEv3.cxx
TEvtGen/EvtGenModels/EvtPyGaGa.cxx
TEvtGen/EvtGenModels/EvtPycont.cxx
TOF/AliTOF.cxx
TOF/AliTOFv6T0.cxx
TRD/AliTRDgtuTMU.cxx
cmake/CMakelinuxx8664gcc.cmake

index 9e5d9e9..1eac623 100644 (file)
@@ -457,6 +457,9 @@ install ( DIRECTORY OCDB
 install ( DIRECTORY QAref 
          DESTINATION . 
          PATTERN ".svn" EXCLUDE)
+install ( DIRECTORY GRP 
+         DESTINATION . 
+         PATTERN ".svn" EXCLUDE)
 
 #
 # EOF
index d4915be..e3c52b5 100644 (file)
@@ -2,16 +2,17 @@
 #include <TEveManager.h>
 #include <TEvePointSet.h>
 #include <TGeoManager.h>
+#include <EveBase/AliEveEventManager.h>
 
-#include <AliRunLoader.h>
-#include <AliCluster.h>
-#include <AliTracker.h>
-#include <AliReconstruction.h>
-#include <AliESDEvent.h>
-#include <AliESDtrack.h>
-#include <AliESDfriend.h>
-#include <AliITSRecoParam.h>
-#include <AliEveEventManager.h>
+#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()
index bed86d7..6a513c3 100644 (file)
@@ -7,23 +7,27 @@
  * full copyright notice.                                                 *
  **************************************************************************/
 #ifndef __CINT__
-#include <TBranch.h>
-#include <TClonesArray.h>
+
+#include <TEveManager.h>
+#include <TEveQuadSet.h>
 #include <TGeoNode.h>
 #include <TGeoBBox.h>
 #include <TGeoManager.h>
 #include <TStyle.h>
-#include <TTree.h>
-#include <TEveManager.h>
-#include <TEveQuadSet.h>
 #include <TEveTrans.h>
+#include <TClonesArray.h>
+#include <TTree.h>
+#include <TBranch.h>
+
+#include <EveBase/AliEveEventManager.h>
 
 #include <AliRunLoader.h>
 #include <AliCluster.h>
 #include <AliEMCALGeometry.h>
 #include <AliEMCALDigit.h>
 #include <AliLog.h>
-#include <AliEveEventManager.h>
+
+// #include <Riostream.h>
 #endif
 
 void emcal_digits()
index 4775b20..76c8557 100644 (file)
@@ -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; j<kvertexnumber; j++) vertexposition[1][j] = 
     new TVector3((GetReflection(vertexposition[0][j],param))->X(),
-                (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; i<kshapesnumber; i++) vertexposition[i] = 
                                                 new TVector3*[kvertexnumber];
   //First Shape Vertex Positioning
-  vertexposition[0][0] = new TVector3(fgkCarbonFiberLowerSupportLowerLenght);
+  vertexposition[0][0] = new TVector3(fgkCarbonFiberLowerSupportLowerLenght, 0, 0);
   vertexposition[0][1] = new TVector3(fgkCarbonFiberTriangleLength
-                                          -            fgkCarbonFiberLowerSupportLowerLenght);
+                                     - fgkCarbonFiberLowerSupportLowerLenght, 0, 0);
   vertexposition[0][2] = new TVector3();
-  vertexposition[0][3] = new TVector3(fgkCarbonFiberTriangleLength);
+  vertexposition[0][3] = new TVector3(fgkCarbonFiberTriangleLength, 0, 0);
   //Second Shape Vertex Positioning
   Double_t theta = TMath::ATan((fgkCarbonFiberLowerSupportVolumePosition[1]
                                 -                              fgkCarbonFiberLowerSupportVolumePosition[0])
                                 /                              fgkCarbonFiberTriangleLength);
   vertexposition[1][0] = new TVector3(vertexposition[0][0]->X(),
                                                                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; i<kvertexnumber; i++) 
                xvertexpoints[i] = vertexposition[i]->X(), 
@@ -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; i<nedges; i++)
        vertexposition[i+5] = 
                new TVector3(router*CosD(psi+i*(2.*phi/nedges)),
-                            router*SinD(psi+i*(2.*phi/nedges)));
+                            router*SinD(psi+i*(2.*phi/nedges)), 0);
   ///////////////////////////////////////////////////////////////////////
   // TGeoXTru Volume definition for Cooling Tube Support Arc Part
   ///////////////////////////////////////////////////////////////////////
@@ -2153,14 +2153,14 @@ TGeoVolume* AliITSv11GeometrySSD::GetCoolingTubeSupport(Int_t nedges){
    ////////////////////////////////////////
   // Positioning the vertices for TGeoXTru
   ////////////////////////////////////////
-  virtualvertex[0] = new TVector3(-fgkCoolingTubeSupportRmax,-fgkCoolingTubeSupportRmax); 
-  virtualvertex[1] = new TVector3(virtualvertex[0]->X(),-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; i<karcnumber; i++){
        for(Int_t j=0; j<knedges+1; j++){
                vertexposition[j+i*(knedges+1)] = new TVector3(radius[i]*CosD(angle[i]),
-                                                                                              radius[i]*SinD(angle[i]));
+                                                        radius[i]*SinD(angle[i]), 0);
                angle[i] +=  deltangle[i]*(1.0-2.0*i);
        }       
   }
@@ -2742,29 +2742,30 @@ for(Int_t i=0; i<karcnumber; i++){
        }
   }
   for(Int_t i=0; i<kendflexlayernumber; i++){
-       vertex[i][0] = new TVector3(transvector[i]->X(),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; j<karcnumber*(knedges+1); j++){
                if(j<(knedges+1)){
                        vertex[i][j+2] = new TVector3(vertexposition[j]->X()*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; i<nedges+1; i++){
        vertexposition[kvertexnumber+i] = new TVector3(radius*CosD(phi+i*deltapsi),
-                                                                                              radius*SinD(phi+i*deltapsi));
+                                                  radius*SinD(phi+i*deltapsi),
+                                                  0);
    *vertexposition[kvertexnumber+i] += (*transvector);
   }
   Double_t param[4] = {1.0,0.0,0.0,-0.5*fgkSSDCoolingBlockLength};  
@@ -3348,7 +3350,7 @@ void AliITSv11GeometrySSD::GetSSDChipCables(TGeoVolume *&cableL, TGeoVolume *&ca
   TVector3* vertex = new TVector3();
   TVector3* transvector[kssdchipcableslaynumber];
   transvector[0] = new TVector3(fgkSSDChipWidth,
-                                                               SSDChipCablesHeight-ssdchipcablesradius[0]);
+                               SSDChipCablesHeight-ssdchipcablesradius[0], 0);
   transvector[1] = new TVector3();
   TGeoXtru* ssdchipcableshape[kssdchipcableslaynumber*kssdchipcablesnumber];
   TGeoVolume* ssdchipcable[kssdchipcableslaynumber*kssdchipcablesnumber];
@@ -3362,19 +3364,19 @@ void AliITSv11GeometrySSD::GetSSDChipCables(TGeoVolume *&cableL, TGeoVolume *&ca
                                 +               fgkSSDChipCablesHeight[1]);  
        for(Int_t i=0; i<kssdchipcableslaynumber; i++){
                vertexposition[i][0] = new TVector3(0.,SSDChipCablesHeight
-                                                        - fgkSSDChipCablesHeight[0]-i*fgkSSDChipCablesHeight[1]);
+                                             - fgkSSDChipCablesHeight[0]-i*fgkSSDChipCablesHeight[1], 0);
                vertexposition[i][1] = new TVector3(0.,SSDChipCablesHeight
-                                                        - i*fgkSSDChipCablesHeight[0]);
+                                                   - i*fgkSSDChipCablesHeight[0], 0);
                vertexposition[i][2*(nedges+1)+2] = 
                                        new TVector3(fgkSSDChipWidth+ssdchipcablesradius[0]
                                +                                fgkSSDChipCablesWidth[1]
                                +                                fgkSSDChipCablesWidth[2],
                                                                ((1.-i)*fgkSSDChipCablesHeight[i]
-                               +                                fgkSSDChipCablesHeight[1]));
+                               + fgkSSDChipCablesHeight[1]), 0);
         vertexposition[i][2*(nedges+1)+3] = 
                                        new TVector3(vertexposition[i][2*(nedges+1)+2]->X(),
                                                                 vertexposition[i][2*(nedges+1)+2]->Y()
-                               -                                fgkSSDChipCablesHeight[i]);
+                      - fgkSSDChipCablesHeight[i], 0);
            for(Int_t j=0; j<nedges+1; j++){            
                    angle = 0.5*phi+TMath::Power(-1,i+1)*j*deltaphi;
                        vertex->SetX(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; i<kssdchipcableslaynumber; i++){
@@ -3559,15 +3561,15 @@ TList* AliITSv11GeometrySSD::GetLadderCableSegment(Double_t ssdendladdercablelen
                                                                                                  new TVector3*[kvertexnumber];
 //Shape Vertex Positioning
   for(Int_t i=0; i<kladdercablesegmentnumber; i++){
-       laddercablesegmentvertexposition[i][0] = new TVector3(0.,i*fgkSSDFlexHeight[0]);
+    laddercablesegmentvertexposition[i][0] = new TVector3(0.,i*fgkSSDFlexHeight[0], 0);
        laddercablesegmentvertexposition[i][1] = new TVector3(fgkSSDLadderCableWidth,
-                                                                                                                 i*fgkSSDFlexHeight[0]);
+                                                             i*fgkSSDFlexHeight[0], 0);
        laddercablesegmentvertexposition[i][2] = new TVector3(0.,fgkSSDFlexHeight[0]
                                                                                   +                         fgkSSDFlexHeight[1]
-                                                                                  +                      i*fgkSSDFlexHeight[0]);
+                                                             + i*fgkSSDFlexHeight[0], 0);
        laddercablesegmentvertexposition[i][3] = 
                                                   new TVector3(laddercablesegmentvertexposition[i][1]->X(),
-                                                                               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; i<fgklayernumber; i++){
        for(Int_t j=0; j<nedges+1; j++){
                vertex[i][j] = new TVector3(fgkMountingBlockSupportRadius[i]*TMath::Cos(psi0[i]+j*deltapsi[i]),
-                                                                   fgkMountingBlockSupportRadius[i]*TMath::Sin(psi0[i]+j*deltapsi[i]));
+                                           fgkMountingBlockSupportRadius[i]*TMath::Sin(psi0[i]+j*deltapsi[i]), 0);
                if(vertex[i][j]->X()>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; i<fgklayernumber; i++){
     ringsupportvertex[i] = new TVector3*[2*kssdlayladdernumber[i]+3+nedges];   
        ringsupportvertex[i][0] = new TVector3(0.,fgkMountingBlockSupportRadius[i]
-                                                       *                          TMath::Cos(theta[i]));
+                                          * TMath::Cos(theta[i]), 0);
        ringsupportvertex[i][1] = new TVector3(-0.5*fgkSSDMountingBlockLength[0]
                                                        -                          mountingsupportedge[i],
-                                                                                  ringsupportvertex[i][0]->Y());
+                                              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; j<kssdlayladdernumber[i]; j++){
           ringsupportvertex[i][2*j+1] = new TVector3(*ringsupportvertex[i][1]);        
@@ -4760,7 +4762,7 @@ void AliITSv11GeometrySSD::SetLadderSupport(Int_t nedges){
     for(Int_t j=0; j<nedges+1; j++){
                ringsupportvertex[i][2*kssdlayladdernumber[i]+2+j] = 
                        new TVector3((ringsupportvertex[i][0]->Y()-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; i<nedges+1; i++){ 
                angle = 90.+0.5*phi-i*(phi/nedges);
-               vertexposition[0][i] = new TVector3(rmin*CosD(angle),rmin*SinD(angle));
-               vertexposition[1][i] = new TVector3(rmax*CosD(angle),rmax*SinD(angle));
+               vertexposition[0][i] = new TVector3(rmin*CosD(angle),rmin*SinD(angle),0);
+               vertexposition[1][i] = new TVector3(rmax*CosD(angle),rmax*SinD(angle),0);
        }
        Double_t *xvertexpoints = new Double_t[kvertexnumber];
        Double_t *yvertexpoints = new Double_t[kvertexnumber];
index 6a034ce..bb82d27 100644 (file)
@@ -122,4 +122,4 @@ set ( DHDR ITSrecLinkDef.h)
 
 set ( EINCLUDE TPC RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase)
 
-set ( EXPORT AliITStrackV2.h AliITSVertexer.h AliITSRecoParam.h)
+set ( EXPORT AliITStrackV2.h AliITSVertexer.h AliITSRecoParam.h AliITSQAChecker.h AliITSQADataMakerRec.h)
index 7ebb8ac..98277a6 100644 (file)
@@ -84,7 +84,7 @@ Bool_t AliJetMCReader::FillMomentumArray(Int_t event)
     TParticle *part = (TParticle*)arrayMC[label]; //particle
     pt = part->Pt(); // 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);
index a9dc484..a247968 100644 (file)
@@ -89,4 +89,6 @@ set ( EXPORT
   AliMUONTrackParam.h 
   AliMUONCDB.h 
   AliMUONVTrackStore.h
-  AliMUONClusterStoreV2.h)
+  AliMUONClusterStoreV2.h
+  AliMUONQADataMakerRec.h
+  )
index 66ad06b..3581602 100644 (file)
@@ -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
 
 
 
index ffff3a4..efdc917 100644 (file)
@@ -17,6 +17,9 @@
 #include <AliESDtrack.h>
 #include <AliESDtrack.h>
 #include "AliEMCALClusterParams.h" 
+using std::endl;
+using std::cout;
+using std::cerr;
 
 ClassImp(AliEMCALClusterParams)
   
index 1b33397..ec33127 100644 (file)
@@ -33,6 +33,9 @@
 #include <iostream>
 #include <iomanip>
 
+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 << "<ux>       " << setw(12) << ux << " +- " << setw(12) << eux << (TMath::Abs(ux)<2*eux?" NOT significant ":" ") << std::endl;
index a2bd9e9..eeb8324 100644 (file)
@@ -97,7 +97,7 @@
 #include "TBox.h"
 #include "TCanvas.h"
 #include "TText.h"
-
+using std::make_pair;
 ClassImp(AliAnalysisTriggerScalers)
 
 namespace {
index b0f6771..a5b6610 100644 (file)
@@ -67,7 +67,8 @@
 #include "TString.h"
 #include "TSystem.h"
 #include <vector>
-
+#include <fstream>
+using std::ifstream;
 namespace
 {
   Int_t splitLevel=10;
index 60d11f6..30fd480 100644 (file)
@@ -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()
index b72f612..3d9d27e 100644 (file)
@@ -40,6 +40,9 @@
 #include "AliAnalysisTaskTriggeredBF.h"
 
 #include "AliBalancePsi.h"
+using std::cout;
+using std::endl;
+using std::cerr;
 
 ClassImp(AliBalancePsi)
 
index 2c7745a..2f45ff3 100644 (file)
@@ -68,6 +68,9 @@
 
 
 #include "TStopwatch.h"
+using std::cout;
+using std::endl;
+using std::cerr;
 
 
 
index bbb8da6..8247073 100644 (file)
@@ -29,6 +29,9 @@
 #include "TString.h"\r
 #include "TMath.h"\r
 //#include "TClonesArray.h"\r
+using std::cout;\r
+using std::endl;\r
+using std::cerr;\r
 \r
 //#include <AliPID.h> //for particle mass only\r
 ClassImp(AliLRCProcess)\r
index 62a6322..145cdb2 100644 (file)
@@ -48,6 +48,9 @@
 #include "AliHelperPID.h"\r
 \r
 #include "AliEbyEParticleRatioFluctuationTask.h"\r
+using std::cout;\r
+using std::endl;\r
+using std::cerr;\r
 \r
 ClassImp(AliEbyEParticleRatioFluctuationTask)\r
 \r
index d6c46fa..f4d1e90 100644 (file)
 #include "AliV0vertexer.h"
 #include "AliVCluster.h"
 
+#include <iostream>
+using std::cout;
+using std::endl;
+
 ClassImp(AliAnalysisTaskEMCALIsoPhoton)
 
 //________________________________________________________________________
index 2281322..338f461 100644 (file)
@@ -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
index f905a7d..13403a5 100644 (file)
@@ -82,6 +82,8 @@
 
 #include "AliCentrality.h"
 
+using namespace std;
+
 ClassImp(AliAnalysisTaskHFECal)
 //________________________________________________________________________
 AliAnalysisTaskHFECal::AliAnalysisTaskHFECal(const char *name) 
index b67d9e2..d814de5 100644 (file)
@@ -51,6 +51,9 @@
 #include "AliVEvent.h"
 
 #include "AliAnalysisTaskFragmentationFunction.h"
+using std::cout;
+using std::endl;
+using std::cerr;
 
 ClassImp(AliAnalysisTaskFragmentationFunction)
 
index 2678c24..3f2b4b0 100644 (file)
 #include "AliFragmentationFunctionCorrections.h"
 #include <iostream> // OB TEST!!!
 #include <fstream>
+using std::cout;
+using std::endl;
+using std::cerr;
+using std::fstream;
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
index 9705999..8d4acaa 100644 (file)
@@ -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)
index 5699470..4ff5eef 100644 (file)
@@ -24,6 +24,9 @@
 #include "AliVCluster.h"
 #include "AliVEvent.h"
 #include "AliVParticle.h"
+using std::cout;
+using std::endl;
+using std::cerr;
 
 ClassImp(AliEmcalJetTask)
 
index 6d5d755..2425109 100644 (file)
@@ -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)
index da1df0b..e6c3c53 100644 (file)
@@ -27,6 +27,7 @@
 #include "AliEmcalParticle.h"
 #include "AliPicoTrack.h"
 #include "AliEMCALGeometry.h"
+using std::vector;
 
 ClassImp(AliAnalysisTaskEmcalJetHadCorQA)
 
index f181016..864e3db 100644 (file)
@@ -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"));
index b9f2e96..776be95 100644 (file)
@@ -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"));
index 11f5760..3968b41 100644 (file)
@@ -33,8 +33,9 @@
 #include "AliTrackFitterRieman.h"
 #include "AliTrackResidualsChi2.h"
 #include "AliESDEvent.h"
-#include "AliESDfriend.h"
 #include "AliLog.h"
+#include "AliESDfriend.h"
+
 ClassImp(AliAlignmentTracks)
 
 //______________________________________________________________________________
index f4db64a..5095369 100644 (file)
@@ -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);
index 9043867..4d0ccbd 100644 (file)
 
 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()
index 6eb708e..3a94c00 100644 (file)
@@ -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;
+   }
 
 }
 
index 1048be2..86fcf36 100644 (file)
 
 class AliTOFcluster;
 
-extern TROOT *gROOT;
+// extern TROOT *gROOT;
+// extern TVirtualMC *gMC;
 
-extern AliRun *gAlice;
+// extern AliRun *gAlice;
 
 ClassImp(AliTOF)
 
index 9a8f691..4c99f68 100644 (file)
@@ -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)
 
index 3110a89..8a333da 100644 (file)
@@ -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;
            }
        }
 
index 74413fc..c1f0e28 100644 (file)
@@ -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)