fix for build and headfiles

Author: Pengchong Hu

PWGCF/MultiparticleCorrelations/Tasks/CMakeLists.txt

@@ -28,11 +28,8 @@ o2physics_add_dpl_workflow(multiharmonic-correlations
                     SOURCES multiharmonicCorrelations.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
                     COMPONENT_NAME Analysis)
-<<<<<<< HEAD
 
 o2physics_add_dpl_workflow(multiparticle-cumulants
                     SOURCES multiparticleCumulants.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
                     COMPONENT_NAME Analysis)
-=======
->>>>>>> fb3e94cf1176f17e0ef923e20450f3148807bddf

PWGCF/MultiparticleCorrelations/Tasks/multiharmonicCorrelations.cxx

@@ -15,16 +15,27 @@
 #include "Common/DataModel/TrackSelectionTables.h" // needed for aod::TracksDCA table
 
 #include <CCDB/BasicCCDBManager.h>
+#include <CommonConstants/MathConstants.h>
 #include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
-#include <Framework/DataTypes.h>
+#include <Framework/Configurable.h>
+#include <Framework/InitContext.h>
+#include <Framework/OutputObjHeader.h>
 #include <Framework/runDataProcessing.h>
 
+#include <TCollection.h>
+#include <TFile.h>
 #include <TComplex.h>
 #include <TGrid.h>
-#include <TH1D.h>
+#include <TH1.h>
+#include <TH2.h>
+#include <TList.h>
+#include <TObject.h>
+#include <TString.h>
 #include <TSystem.h>
 
+#include <cstdint>
 #include <cstring>
 #include <string>
 #include <vector>