meanpt

Author: sweta29singh

PWGCF/EbyEFluctuations/Tasks/CMakeLists.txt

@@ -33,7 +33,6 @@ o2physics_add_dpl_workflow(antiproton-cumulants-mc
                     SOURCES antiprotonCumulantsMc.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
                     COMPONENT_NAME Analysis)
-<<<<<<< HEAD
 
 o2physics_add_dpl_workflow(event-mean-pt-id
                     SOURCES eventMeanPtId.cxx
@@ -65,48 +64,12 @@ o2physics_add_dpl_workflow(netcharge-fluctuations
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
                     COMPONENT_NAME Analysis)
 
-=======
-		
-o2physics_add_dpl_workflow(event-meanpt-id
-                    SOURCES eventMeanPtId.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
-                    COMPONENT_NAME Analysis)
-
-o2physics_add_dpl_workflow(robust-fluctuation-observables
-                    SOURCES RobustFluctuationObservables.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
-                    COMPONENT_NAME Analysis)
-
-o2physics_add_dpl_workflow(v0pt-pp-task
-                    SOURCES Diff_pT_fluct_PID.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
-                    COMPONENT_NAME Analysis)
-
-o2physics_add_dpl_workflow(factorial-moments
-                    SOURCES FactorialMomentsTask.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
-                    COMPONENT_NAME Analysis)
-
-o2physics_add_dpl_workflow(kaon-isospin-fluctuations
-                    SOURCES kaonIsospinFluctuations.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
-                    COMPONENT_NAME Analysis)
-
-o2physics_add_dpl_workflow(netcharge-fluctuations
-                    SOURCES netchargeFluctuations.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
-                    COMPONENT_NAME Analysis)
-
->>>>>>> meanptfluct
 o2physics_add_dpl_workflow(nch-cumulants-id
                     SOURCES nchCumulantsId.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
                     COMPONENT_NAME Analysis)
-<<<<<<< HEAD
 
 o2physics_add_dpl_workflow(v0pt-had-pi-ka-prot
                     SOURCES v0ptHadPiKaProt.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
                     COMPONENT_NAME Analysis)
-=======
->>>>>>> meanptfluct