Covering PWGPP to native cmake
authorhristov <Peter.Hristov@cern.ch>
Fri, 5 Dec 2014 09:47:14 +0000 (10:47 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:52:07 +0000 (13:52 +0100)
13 files changed:
CMakeLists.txt
PWGPP/CMakeLists.txt
PWGPP/ITS/AliAnalysisTaskITSTrackingCheck.cxx
PWGPP/TPC/AliPerformanceMatch.h
PWGPP/TRD/AliTRDcalibration.cxx
PWGPP/TRD/AliTRDcheckPID.cxx
PWGPP/TRD/AliTRDclusterResolution.cxx
PWGPP/TRD/AliTRDefficiency.cxx
PWGPP/TRD/AliTRDefficiencyMC.cxx
PWGPP/TRD/AliTRDpidRefMakerLQ.cxx
PWGPP/TRD/AliTRDpidRefMakerNN.cxx
PWGPP/TRD/AliTRDpwgppHelper.h
PWGPP/TRD/AliTRDresolution.h

index 1f1f493..59feff2 100644 (file)
@@ -254,6 +254,7 @@ add_subdirectory(PWGDQ)
 add_subdirectory(PWGHF)
 add_subdirectory(PWGJE)
 add_subdirectory(PWGLF)
+add_subdirectory(PWGPP)
 # Depends on PP - To fix depedencies
 add_subdirectory(PWGUD)
 
index cab1cc0..4a2aec3 100644 (file)
-# AliRoot Build System CMakeLists for PWGPP
-#
-# Author: Johny Jose m(johny.jose@cern.ch)
-#         Port of previous Makefile build to cmake
+# **************************************************************************
+# * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
+# *                                                                        *
+# * Author: The ALICE Off-line Project.                                    *
+# * Contributors are mentioned in the code where appropriate.              *
+# *                                                                        *
+# * Permission to use, copy, modify and distribute this software and its   *
+# * documentation strictly for non-commercial purposes is hereby granted   *
+# * without fee, provided that the above copyright notice appears in all   *
+# * copies and that both the copyright notice and this permission notice   *
+# * appear in the supporting documentation. The authors make no claims     *
+# * about the suitability of this software for any purpose. It is          *
+# * provided "as is" without express or implied warranty.                  *
+# **************************************************************************/
 
-cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
+#Module
+set (MODULE PWGPP)
 
-file(GLOB PACKAGES CMake*.pkg)
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/PWGPP)
 
-ALICE_BuildModule()
+# Additional includes - alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSIS
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/ANALYSISalice
+                    ${AliRoot_SOURCE_DIR}/ANALYSIS/Tender
+                    ${AliRoot_SOURCE_DIR}/CORRFW
+                    ${AliRoot_SOURCE_DIR}/EMCAL/EMCALUtils
+                    ${AliRoot_SOURCE_DIR}/HMPID/HMPIDbase
+                    ${AliRoot_SOURCE_DIR}/ITS/ITSbase
+                    ${AliRoot_SOURCE_DIR}/ITS/ITSrec
+                    ${AliRoot_SOURCE_DIR}/PWG/CaloTrackCorrBase
+                    ${AliRoot_SOURCE_DIR}/STAT
+                    ${AliRoot_SOURCE_DIR}/STEER/AOD
+                    ${AliRoot_SOURCE_DIR}/STEER/CDB
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
+                    ${AliRoot_SOURCE_DIR}/STEER/STEER
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                    ${AliRoot_SOURCE_DIR}/TOF/TOFbase
+                    ${AliRoot_SOURCE_DIR}/TOF/TOFrec
+                    ${AliRoot_SOURCE_DIR}/TPC/TPCbase
+                    ${AliRoot_SOURCE_DIR}/TPC/TPCrec
+                    ${AliRoot_SOURCE_DIR}/TPC/TPCsim
+                    ${AliRoot_SOURCE_DIR}/TRD/TRDbase
+                    ${AliRoot_SOURCE_DIR}/TRD/TRDrec
+  )
+
+# Sources as introduced by the authors
+#file ( GLOB SRCS1 "*.cxx" )
+set ( SRCS1
+  AliAnaFwdDetsQA.cxx
+  AliAnalysisTaskFilteredTree.cxx
+  AliAnalysisTaskIPInfo.cxx
+  AliAnalysisTaskITSTPCalignment.cxx
+  AliAnalysisTaskQASym.cxx
+  AliAnalysisTaskV0QA.cxx
+  AliAnalysisTaskVtXY.cxx
+  AliAnaVZEROQA.cxx
+  AliFilteredTreeAcceptanceCuts.cxx
+  AliFilteredTreeEventCuts.cxx
+  AliIntSpotEstimator.cxx
+  AliRelAlignerKalmanArray.cxx
+  AliTaskCDBconnect.cxx
+  AliTrackComparison.cxx
+  AliTrackComparisonESD.cxx
+  )
+#file ( GLOB SRCS2 "global/*.cxx" )
+set ( SRCS2
+  global/AliAnalysisTaskGlobalQA.cxx
+  global/AliAnalysisTaskVertexESD.cxx
+  global/AliGlobalFBFqa.cxx
+  )
+#file ( GLOB SRCS3 "cosmic/*.cxx" )
+set ( SRCS3
+  cosmic/AliAnalysisTaskCosmic.cxx
+  )
+#file ( GLOB SRCS4 "tender/*.cxx" )
+set ( SRCS4
+  tender/AliTenderSupplyTRD.cxx
+  )
+#file ( GLOB SRCS5 "HMPID/*.cxx" )
+set ( SRCS5
+  HMPID/AliHMPIDTaskQA.cxx
+  )
+#file ( GLOB SRCS6 "ITS/*.cxx" )
+set ( SRCS6
+  ITS/AliAlignmentDataFilterITS.cxx
+  ITS/AliAnalysisTaskdEdxSSDQA.cxx
+  ITS/AliAnalysisTaskITSAlignQA.cxx
+  ITS/AliAnalysisTaskITSsaTracks.cxx
+  ITS/AliAnalysisTaskITSTrackingCheck.cxx
+  ITS/AliAnalysisTaskSDDRP.cxx
+  ITS/AliAnalysisTaskSEImpParRes.cxx
+  ITS/AliAnalysisTaskSPD.cxx
+  ITS/AliMeanVertexCalibTask.cxx
+  ITS/AliMeanVertexPreprocessorOffline.cxx
+  ITS/AliSPDUtils.cxx
+  ITS/AliTrackMatchingTPCITSCosmics.cxx
+  )
+#file ( GLOB SRCS7 "TRD/*.cxx" )
+set ( SRCS7
+  TRD/AliTRDalignmentTask.cxx
+  TRD/AliTRDcalibration.cxx
+  TRD/AliTRDcheckDET.cxx
+  TRD/AliTRDcheckESD.cxx
+  TRD/AliTRDcheckPID.cxx
+  TRD/AliTRDcheckTRK.cxx
+  TRD/AliTRDclusterResolution.cxx
+  TRD/AliTRDefficiency.cxx
+  TRD/AliTRDefficiencyMC.cxx
+  TRD/AliTRDinfoGen.cxx
+  TRD/AliTRDmultiplicity.cxx
+  TRD/AliTRDonlineTrackletFilter.cxx
+  TRD/AliTRDonlineTrackletQA.cxx
+  TRD/AliTRDpidRefMaker.cxx
+  TRD/AliTRDpidRefMakerLQ.cxx
+  TRD/AliTRDpidRefMakerNN.cxx
+  TRD/AliTRDpwgppHelper.cxx
+  TRD/AliTRDrecoTask.cxx
+  TRD/AliTRDresolution.cxx
+  TRD/AliTRDv0Monitor.cxx
+  )
+#file ( GLOB SRCS8 "TPC/*.cxx" )
+set ( SRCS8
+  TPC/AliAnalysisNoiseTPC.cxx
+  TPC/AliComparisonDraw.cxx
+  TPC/AliComparisonObject.cxx
+  TPC/AliESDRecInfo.cxx
+  TPC/AliESDRecKinkInfo.cxx
+  TPC/AliESDRecV0Info.cxx
+  TPC/AliESDresolMakerFast.cxx
+  TPC/AliESDresolParams.cxx
+  TPC/AliGenInfoMaker.cxx
+  TPC/AliGenInfoTask.cxx
+  TPC/AliGenKinkInfo.cxx
+  TPC/AliGenV0Info.cxx
+  TPC/AliMaterialBudget.cxx
+  TPC/AliMCInfoCuts.cxx
+  TPC/AliMCInfo.cxx
+  TPC/AliMCTrackingTestTask.cxx
+  TPC/AliPerfAnalyzeInvPt.cxx
+  TPC/AliPerformanceDCA.cxx
+  TPC/AliPerformanceDEdx.cxx
+  TPC/AliPerformanceEff.cxx
+  TPC/AliPerformanceMatch.cxx
+  TPC/AliPerformanceMC.cxx
+  TPC/AliPerformanceObject.cxx
+  TPC/AliPerformancePtCalib.cxx
+  TPC/AliPerformancePtCalibMC.cxx
+  TPC/AliPerformanceRes.cxx
+  TPC/AliPerformanceTask.cxx
+  TPC/AliPerformanceTPC.cxx
+  TPC/AliRecInfoCuts.cxx
+  TPC/AliRecInfoMaker.cxx
+  TPC/AliTaskConfigOCDB.cxx
+  TPC/AliTPCComparisonPID.cxx
+  TPC/AliTPCPerformanceSummary.cxx
+  TPC/AliTPCtaskPID.cxx
+  TPC/AliTPCtaskQA.cxx
+  TPC/AliTreeDraw.cxx
+  TPC/AliTPCPIDBase.cxx
+  TPC/AliTPCPIDEtaTree.cxx
+  TPC/AliTPCPIDEtaQA.cxx
+  TPC/AliTPCcalibResidualPID.cxx
+  )
+#file ( GLOB SRCS9 "TOF/*.cxx" )
+set ( SRCS9
+  TOF/AliAnalysisTaskTOFqa.cxx
+  TOF/AliAnalysisTaskTOFqaID.cxx
+  )
+#file ( GLOB SRCS10 "TRD/info/*.cxx" )
+set ( SRCS10
+  TRD/info/AliTRDchmbInfo.cxx
+  TRD/info/AliTRDclusterInfo.cxx
+  TRD/info/AliTRDeventCuts.cxx
+  TRD/info/AliTRDeventInfo.cxx
+  TRD/info/AliTRDpidInfo.cxx
+  TRD/info/AliTRDtrackInfo.cxx
+  TRD/info/AliTRDtrendingManager.cxx
+  TRD/info/AliTRDtrendValue.cxx
+  TRD/info/AliTRDtriggerInfo.cxx
+  TRD/info/AliTRDv0Info.cxx
+  )
+#file ( GLOB SRCS11 "background/*.cxx" )
+set ( SRCS11
+  background/AliHistoListWrapper.cxx
+  )
+#file ( GLOB SRCS12 "Centrality/*.cxx" )
+set ( SRCS12
+  Centrality/AliAnalysisTaskHIMultCorr.cxx
+  Centrality/AliMultiplicityCorrelations.cxx
+  )
+#file ( GLOB SRCS13 "ZDC/*.cxx" )
+set ( SRCS13
+  ZDC/AliAnalysisTaskZDC.cxx
+  ZDC/AliAnalysisTaskZDCpA.cxx
+  )
+#file ( GLOB SRCS14 "T0/*.cxx" )
+set ( SRCS14
+  T0/AliT0AnalysisTaskQA.cxx
+  )
+#file ( GLOB SRCS15 "VZERO/*PbPb.cxx" )
+set (SRCS15
+  VZERO/AliAnaVZEROPbPb.cxx
+  )
+#file ( GLOB SRCS16 "EvTrkSelection/*.cxx" )
+set ( SRCS16
+  EvTrkSelection/AliAnalysisTrackingUncertainties.cxx
+  EvTrkSelection/AliCFSingleTrackEfficiencyTask.cxx
+  EvTrkSelection/AliSingleTrackEffCuts.cxx
+  )
+
+list ( APPEND SRCS 
+  ${SRCS1} 
+  ${SRCS2} 
+  ${SRCS3} 
+  ${SRCS4} 
+  ${SRCS5} 
+  ${SRCS6} 
+  ${SRCS7} 
+  ${SRCS8} 
+  ${SRCS9} 
+  ${SRCS10} 
+  ${SRCS11} 
+  ${SRCS12} 
+  ${SRCS13} 
+  ${SRCS14}
+  ${SRCS15}
+  ${SRCS16}
+  )
+
+# Headers from sources
+string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
+
+# Generate the dictionary
+# It will create G_ARG1.cxx and G_ARG1.h / ARG1 = function first argument
+get_directory_property(incdirs INCLUDE_DIRECTORIES)
+generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
+
+# Add a shared library
+add_library(${MODULE} SHARED  ${SRCS} G__${MODULE}.cxx)
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS ANALYSISalice CDB CORRFW EMCALUtils ITSrec HMPIDbase PWGCaloTrackCorrBase STEER Tender TOFrec TPCrec TRDrec Postscript)
+generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
+
+# Linking the library
+target_link_libraries(${MODULE} ${LIBDEPS})
+
+# Public include folders that will be propagated to the dependecies
+target_include_directories(${MODULE} PUBLIC ${incdirs})
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Installation
+install(TARGETS ${MODULE} 
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib)
+install(FILES ${HDRS} DESTINATION include)
+
+# install macros as needed
+install ( DIRECTORY macros 
+         DESTINATION PWGPP 
+         PATTERN ".d"  EXCLUDE 
+         PATTERN ".so" EXCLUDE)
+install ( DIRECTORY CalibMacros 
+         DESTINATION PWGPP 
+         PATTERN ".d"  EXCLUDE 
+         PATTERN ".so" EXCLUDE)
+install ( DIRECTORY PilotTrain
+         DESTINATION PWGPP/ 
+         PATTERN ".d"  EXCLUDE 
+         PATTERN ".so" EXCLUDE)
+install ( FILES HMPID/AddTaskHmpidQA.C
+         DESTINATION PWGPP/HMPID)
+install ( FILES T0/AddTaskT0QA.C
+         DESTINATION PWGPP/T0)
+install ( FILES TOF/AddTaskTOFQA.C
+                TOF/AddTaskTOFqaID.C
+         DESTINATION PWGPP/TOF)
+install ( FILES TOF/AddTaskTOFQA.C
+         DESTINATION PWGPP/TOF)
+install ( DIRECTORY TPC/macros
+         DESTINATION PWGPP/TPC
+         PATTERN ".C")
+install ( DIRECTORY TRD
+         DESTINATION PWGPP)
+install ( FILES ZDC/AddTaskZDCQA.C
+         DESTINATION PWGPP/ZDC)
+install ( FILES PilotTrain/AddTaskMuonQA.C
+         DESTINATION PWGPP/PilotTrain/ )
+install ( FILES VZERO/AddTaskVZEROPbPb.C
+          DESTINATION PWGPP/VZERO/ )
index b00b0b2..d538211 100644 (file)
@@ -50,7 +50,7 @@
 #include "AliESDInputHandlerRP.h"
 #include "AliESDtrackCuts.h"
 #include "AliTrackPointArray.h"
-#include "../ITS/AliITSRecPoint.h"
+#include "AliITSRecPoint.h"
 
 #include "AliInputEventHandler.h"
 #include "AliMCEventHandler.h"
index 1aef7a6..ffd0bf1 100644 (file)
@@ -57,7 +57,7 @@ public :
 
   // Process matching
   void ProcessTPCITS(AliStack* const stack, AliESDtrack *const esdTrack);
-  void ProcessTPCTRD(AliStack* const stack, AliESDtrack *const esdTrack, AliESDfriendTrack *const friendTrack);
+  //  void ProcessTPCTRD(AliStack* const stack, AliESDtrack *const esdTrack, AliESDfriendTrack *const friendTrack);
   void ProcessITSTPC(Int_t trackIdx, AliESDEvent* const esdEvent, AliStack* const stack, AliESDtrack *const esdTrack);
   void ProcessTPCConstrain(AliStack* const stack, AliESDEvent *const esdEvent, AliESDtrack *const esdTrack); // - 01.11.2011
 
index 290a0b2..de3db15 100644 (file)
@@ -57,8 +57,8 @@
 #include "AliTRDCalibraVdriftLinearFit.h"
 #include "AliTRDCalibraMode.h"
 #include "AliTRDCalibraVector.h"
-#include "./Cal/AliTRDCalPad.h"
-#include "./Cal/AliTRDCalDet.h"
+#include "AliTRDCalPad.h"
+#include "AliTRDCalDet.h"
 
 #include "AliLog.h"
 
index 10e6912..836b9a8 100644 (file)
@@ -47,8 +47,8 @@
 #include "AliCDBManager.h"
 #include "AliTRDpidUtil.h"
 
-#include "Cal/AliTRDCalPID.h"
-#include "Cal/AliTRDCalPIDNN.h"
+#include "AliTRDCalPID.h"
+#include "AliTRDCalPIDNN.h"
 #include "AliTRDcheckPID.h"
 #include "AliTRDinfoGen.h"
 #include "AliAnalysisManager.h"
index fbe3693..8764d72 100644 (file)
 #include "info/AliTRDeventInfo.h"
 
 #include "AliTRDcalibDB.h"
-#include "Cal/AliTRDCalROC.h"
-#include "Cal/AliTRDCalDet.h"
+#include "AliTRDCalROC.h"
+#include "AliTRDCalDet.h"
 #include "AliTRDCommonParam.h"
 #include "AliTRDgeometry.h"
 #include "AliTRDpadPlane.h"
index 17b2b3e..dcdacba 100644 (file)
@@ -49,7 +49,7 @@
 
 #include "AliTRDgeometry.h"
 #include "AliTRDtrackV1.h"
-#include "Cal/AliTRDCalPID.h"
+#include "AliTRDCalPID.h"
 #include "AliTRDefficiency.h"
 #include "info/AliTRDtrackInfo.h"
 
index 6d23731..98d246b 100644 (file)
@@ -44,7 +44,7 @@
 #include "AliTRDseedV1.h"
 #include "AliTRDtrackV1.h"
 #include "AliTRDpidUtil.h"
-#include "Cal/AliTRDCalPID.h"
+#include "AliTRDCalPID.h"
 #include "info/AliTRDtrackInfo.h"
 #include "AliTRDinfoGen.h"
 #include "AliTRDefficiencyMC.h"
index 1db5224..14648ab 100644 (file)
 #include <TCanvas.h>
 
 #include "AliLog.h"
-#include "../STAT/TKDPDF.h"
-#include "../STAT/TKDInterpolator.h"
+#include "TKDPDF.h"
+#include "TKDInterpolator.h"
 #include "AliTRDpidRefMakerLQ.h"
-#include "Cal/AliTRDCalPID.h"
-#include "Cal/AliTRDCalPIDLQ.h"
+#include "AliTRDCalPID.h"
+#include "AliTRDCalPIDLQ.h"
 #include "AliTRDseedV1.h"
 #include "AliTRDcalibDB.h"
 #include "AliTRDgeometry.h"
index 987644e..69bdfe3 100644 (file)
@@ -41,8 +41,8 @@
 #include "AliTRDpidRefMakerNN.h"
 #include "AliTRDpidUtil.h"
 
-#include "Cal/AliTRDCalPID.h"
-#include "Cal/AliTRDCalPIDNN.h"
+#include "AliTRDCalPID.h"
+#include "AliTRDCalPIDNN.h"
 #include "info/AliTRDtrackInfo.h"
 #include "info/AliTRDv0Info.h"
 #include "info/AliTRDpidInfo.h"
index 1bed331..6569ae7 100644 (file)
@@ -47,8 +47,8 @@ public:
     kNTRDTASKS = kNTRDQATASKS + kNTRDCALIBTASKS
   };
 
-  AliTRDpwgppHelper();
-  ~AliTRDpwgppHelper();
+  AliTRDpwgppHelper(){;}
+  virtual ~AliTRDpwgppHelper(){;}
 
   static Bool_t DoTask(Int_t idx, Int_t map);
   static Int_t  GetTaskIndex(const Char_t *name);
index a59ce50..0102441 100644 (file)
@@ -94,8 +94,6 @@ public:
 
   AliTRDresolution();
   AliTRDresolution(char* name, Bool_t xchange=kTRUE);
-  AliTRDresolution(const AliTRDresolution&);
-  AliTRDresolution& operator=(const AliTRDresolution&);
   virtual ~AliTRDresolution();
   
   static Bool_t   FitTrack(const Int_t np, AliTrackPoint *points, Float_t params[10]);
@@ -183,6 +181,10 @@ protected:
   // calibration containers
   TObjArray            *fCl;              //! cluster2track calib
   TObjArray            *fMCcl;            //! cluster2mc calib
+
+ private:
+  AliTRDresolution(const AliTRDresolution&);
+  AliTRDresolution& operator=(const AliTRDresolution&);
   
   ClassDef(AliTRDresolution, 11) // TRD tracking resolution task
 };