From a3244ce9abf8fac931f160011a30d4101f1d12f1 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 22 Oct 2020 21:40:13 +0300 Subject: [PATCH 001/274] cuts fixed --- setups/hades-analysis-config.yml | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/setups/hades-analysis-config.yml b/setups/hades-analysis-config.yml index 68d7de21..f7b09fb0 100644 --- a/setups/hades-analysis-config.yml +++ b/setups/hades-analysis-config.yml @@ -9,8 +9,26 @@ _axes: - &axis_rapidity name: mdc_vtx_tracks/rapidity nb: 15 - lo: -0.1 + lo: 0.01 hi: 1.49 +_cuts: + - &protons_cuts + mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/beta: { range: [0.84, 1.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/beta: { range: [0.85, 1.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/beta: { range: [0.80, 1.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } hades_analysis: event-variables: @@ -29,7 +47,7 @@ hades_analysis: - *axis_pT - *axis_rapidity cuts: - mdc_vtx_tracks/pid: { equals: 2212 } + *protons_cuts qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT @@ -45,7 +63,7 @@ hades_analysis: axes: - *axis_rapidity cuts: - mdc_vtx_tracks/pid: { equals: 2212 } + *protons_cuts mdc_vtx_tracks/pT: { range: [0.0, 1.6] } qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} @@ -60,7 +78,7 @@ hades_analysis: - recentering - twist-and-rescale cuts: - forward_wall_hits/ring: { range: [1.0, 5.0] } + *w1_cuts - name: W2 type: track phi: forward_wall_hits/phi @@ -69,7 +87,7 @@ hades_analysis: - recentering - twist-and-rescale cuts: - forward_wall_hits/ring: { range: [6.0, 7.0] } + *w2_cuts - name: W3 type: track phi: forward_wall_hits/phi @@ -78,4 +96,4 @@ hades_analysis: - recentering - twist-and-rescale cuts: - forward_wall_hits/ring: { range: [8.0, 10.0] } \ No newline at end of file + *w3_cuts \ No newline at end of file From b48e755a2f6e01a75a88a60f00bfbddc9e16e465 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 22 Oct 2020 22:38:56 +0300 Subject: [PATCH 002/274] attempt to fix a bug --- setups/hades-analysis-config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades-analysis-config.yml b/setups/hades-analysis-config.yml index f7b09fb0..6c015795 100644 --- a/setups/hades-analysis-config.yml +++ b/setups/hades-analysis-config.yml @@ -64,7 +64,7 @@ hades_analysis: - *axis_rapidity cuts: *protons_cuts - mdc_vtx_tracks/pT: { range: [0.0, 1.6] } +# mdc_vtx_tracks/pT: { range: [0.0, 1.6] } qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT From 29371098186d6305bf15264b729d9ece32c4b701 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 23 Oct 2020 02:08:20 +0300 Subject: [PATCH 003/274] Bug with weights of W-vectors fixed --- setups/hades-analysis-config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setups/hades-analysis-config.yml b/setups/hades-analysis-config.yml index 6c015795..a4762765 100644 --- a/setups/hades-analysis-config.yml +++ b/setups/hades-analysis-config.yml @@ -14,6 +14,7 @@ _axes: _cuts: - &protons_cuts mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks/pT: {range: [0.0, 1.6]} mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} @@ -73,7 +74,7 @@ hades_analysis: - name: W1 type: track phi: forward_wall_hits/phi - weight: Ones + weight: forward_wall_hits/signal corrections: - recentering - twist-and-rescale @@ -82,7 +83,7 @@ hades_analysis: - name: W2 type: track phi: forward_wall_hits/phi - weight: Ones + weight: forward_wall_hits/signal corrections: - recentering - twist-and-rescale @@ -91,7 +92,7 @@ hades_analysis: - name: W3 type: track phi: forward_wall_hits/phi - weight: Ones + weight: forward_wall_hits/signal corrections: - recentering - twist-and-rescale From 9c1258efcb07231c6bb8cadbef77be05e2c5b666 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 26 Oct 2020 17:53:06 +0300 Subject: [PATCH 004/274] Bug with axis fixed --- setups/hades-analysis-config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades-analysis-config.yml b/setups/hades-analysis-config.yml index a4762765..97e66b32 100644 --- a/setups/hades-analysis-config.yml +++ b/setups/hades-analysis-config.yml @@ -9,7 +9,7 @@ _axes: - &axis_rapidity name: mdc_vtx_tracks/rapidity nb: 15 - lo: 0.01 + lo: -0.01 hi: 1.49 _cuts: - &protons_cuts From 4bf0c0d9c9df7b3e83282c86bea69aa05d1a5a2d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 26 Oct 2020 18:19:35 +0300 Subject: [PATCH 005/274] QnAnalysisObservables added --- src/CMakeLists.txt | 1 + src/QnAnalysisObservables/CMakeLists.txt | 8 +++ src/QnAnalysisObservables/Calculate.cpp | 25 ++++++++ src/QnAnalysisObservables/FileManager.cpp | 7 +++ src/QnAnalysisObservables/FileManager.hpp | 46 +++++++++++++++ src/QnAnalysisObservables/Method.cpp | 29 +++++++++ src/QnAnalysisObservables/Method.hpp | 72 +++++++++++++++++++++++ src/QnAnalysisObservables/MethodOf3SE.cpp | 52 ++++++++++++++++ src/QnAnalysisObservables/MethodOf3SE.hpp | 29 +++++++++ src/QnAnalysisObservables/calculator.cc | 5 ++ src/QnAnalysisObservables/calculator.h | 14 +++++ 11 files changed, 288 insertions(+) create mode 100644 src/QnAnalysisObservables/CMakeLists.txt create mode 100644 src/QnAnalysisObservables/Calculate.cpp create mode 100644 src/QnAnalysisObservables/FileManager.cpp create mode 100644 src/QnAnalysisObservables/FileManager.hpp create mode 100644 src/QnAnalysisObservables/Method.cpp create mode 100644 src/QnAnalysisObservables/Method.hpp create mode 100644 src/QnAnalysisObservables/MethodOf3SE.cpp create mode 100644 src/QnAnalysisObservables/MethodOf3SE.hpp create mode 100644 src/QnAnalysisObservables/calculator.cc create mode 100644 src/QnAnalysisObservables/calculator.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e02dd849..0137b8b8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(QnAnalysisBase) add_subdirectory(QnAnalysisConfig) add_subdirectory(QnAnalysisCorrect) add_subdirectory(QnAnalysisCorrelate) +add_subdirectory(QnAnalysisObservables) #add_subdirectory(correlate) #add_subdirectory(tasks) #add_subdirectory(analyze) diff --git a/src/QnAnalysisObservables/CMakeLists.txt b/src/QnAnalysisObservables/CMakeLists.txt new file mode 100644 index 00000000..8a75e6b3 --- /dev/null +++ b/src/QnAnalysisObservables/CMakeLists.txt @@ -0,0 +1,8 @@ +set(SOURCES + FileManager.cpp + Method.cpp + MethodOf3SE.cpp + ) + +add_executable(flow Calculate.cpp ${SOURCES}) +target_link_libraries(flow QnTools::Base ${ROOT_LIBRARIES}) \ No newline at end of file diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp new file mode 100644 index 00000000..832a361e --- /dev/null +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -0,0 +1,25 @@ +// +// Created by mikhail on 10/23/20. +// + +#include "FileManager.hpp" +#include "MethodOf3SE.hpp" + +int main(){ + FileManager::OpenFile( "~/Correlations/new_qn_analysis.root" ); + MethodOf3SE test_x = MethodOf3SE({"u_RESCALED", "u", "x1"}, {{"W1_RESCALED", "W1","x1"}}, + { + {"W2_RESCALED", "W2"}, {"W3_RESCALED", "W3"}, + {"M_RESCALED", "Mb", "", {"event_header_selected_tof_rpc_centrality"}, + {{"mdc_vtx_tracks_rapidity", 1, 0.19, 0.39}}}, + } ); + test_x.SetQqDirectory("/QQ/SP"); + test_x.SetUqDirectory("/uQ/SP"); + test_x.CalculateObservables(); + auto file_out = TFile::Open("out.root", "recreate"); + file_out->cd(); + test_x.Write(); + file_out->Close(); + + return 0; +} \ No newline at end of file diff --git a/src/QnAnalysisObservables/FileManager.cpp b/src/QnAnalysisObservables/FileManager.cpp new file mode 100644 index 00000000..d393550c --- /dev/null +++ b/src/QnAnalysisObservables/FileManager.cpp @@ -0,0 +1,7 @@ +// +// Created by mikhail on 10/23/20. +// + +#include "FileManager.hpp" + +FileManager* FileManager::instance_= nullptr; \ No newline at end of file diff --git a/src/QnAnalysisObservables/FileManager.hpp b/src/QnAnalysisObservables/FileManager.hpp new file mode 100644 index 00000000..2d6fd652 --- /dev/null +++ b/src/QnAnalysisObservables/FileManager.hpp @@ -0,0 +1,46 @@ +// +// Created by mikhail on 10/23/20. +// + +#ifndef OBSERVABLESCALCULATOR_SRC_FILE_MANAGER_H_ +#define OBSERVABLESCALCULATOR_SRC_FILE_MANAGER_H_ + +#include + +class FileManager { +public: + static bool OpenFile( const std::string& name ){ + if( Instance()->file_ ) + Instance()->file_->Close(); + Instance()->file_ = TFile::Open(name.c_str()); + return Instance()->file_ != nullptr; + } + template + static T* GetObject(const std::string& name){ + if( !Instance()->file_ ) + throw std::runtime_error("FileManager::GetObject(): file is not specified"); + T* obj; + Instance()->file_->GetObject(name.c_str(), obj); + if( !obj ) + throw std::runtime_error("FileManager::GetObject(): there is no object named "+name+" in file"); + return obj; + } + static void Cd( const std::string& directory ){ + if( !Instance()->file_ ) + throw std::runtime_error("FileManager::Cd(): file is not specified"); + Instance()->file_->cd(directory.c_str()); + } + +private: + TFile* file_{}; + static FileManager* instance_; + static FileManager* Instance(){ + if( !instance_ ) + instance_ = new FileManager(); + return instance_; + } + FileManager() = default; + virtual ~FileManager() = default; +}; + +#endif // OBSERVABLESCALCULATOR_SRC_FILE_MANAGER_H_ diff --git a/src/QnAnalysisObservables/Method.cpp b/src/QnAnalysisObservables/Method.cpp new file mode 100644 index 00000000..656f276a --- /dev/null +++ b/src/QnAnalysisObservables/Method.cpp @@ -0,0 +1,29 @@ +// +// Created by mikhail on 10/25/20. +// + +#include "Method.hpp" + +Qn::DataContainer Method::ReadContainerFromFile( const std::string& directory, const std::pair& vectors ){ + Qn::DataContainerStatCollect* obj; + auto name = directory+"/"+vectors.first.name+"."+vectors.second.name+"."+vectors.first.component_name+vectors.second.component_name; + try { + obj = FileManager::GetObject(name); + }catch( std::runtime_error& ){ + name = vectors.second.name+"."+vectors.first.name+"."+vectors.second.component_name+vectors.first.component_name; + FileManager::GetObject(name); + } + auto result = Qn::DataContainerStatCalculate(*obj); + result.SetErrors(Qn::StatCalculate::ErrorType::BOOTSTRAP); + for( const auto& axes : vectors.first.rebin_axes ) + result=result.Rebin( axes ); + for( const auto& axes : vectors.second.rebin_axes ) + result=result.Rebin( axes ); + auto projection = vectors.first.projection_axes; + for( const auto& axis : vectors.second.projection_axes ) + if( std::count(projection.begin(), projection.end(), axis) > 0 ) + projection.push_back(axis); + result.Projection(projection); + return result; +} + diff --git a/src/QnAnalysisObservables/Method.hpp b/src/QnAnalysisObservables/Method.hpp new file mode 100644 index 00000000..9bcccfe1 --- /dev/null +++ b/src/QnAnalysisObservables/Method.hpp @@ -0,0 +1,72 @@ +// +// Created by mikhail on 10/25/20. +// + +#ifndef OBSERVABLESCALCULATOR_SRC_METHOD_H_ +#define OBSERVABLESCALCULATOR_SRC_METHOD_H_ + +#include +#include + +#include "FileManager.hpp" + +struct VectorConfig { + std::string name; + std::string title; + std::string component_name; + std::vector projection_axes; + std::vector rebin_axes; +}; + +class Method { +public: + virtual ~Method() = default; + virtual void CalculateObservables() {} + void SetUqDirectory(const std::string &uq_deirectory) { + uq_directory_ = uq_deirectory; + } + void SetQqDirectory(const std::string &qq_directory) { + qq_directory_ = qq_directory; + } + void Write(){ + int i=0; + std::string component = u_vector_config_.component_name; + for( auto config : q_vectors_configs_){ + component+=config.component_name; + } + for( auto resolution: resolutions_){ + resolution.Write( std::data( "res."+ observables_names_.at(i)+"."+component ) ); + ++i; + } + i=0; + for(auto flow : observables_){ + flow.Write( std::data( "obs."+ observables_names_.at(i)+"."+component ) ); + ++i; + } + } +protected: + Method() = default; + Method(VectorConfig u_vector_config, + std::vector q_vector_config, + std::vector resolution_q_vectors_configs) + : u_vector_config_(std::move(u_vector_config)), + q_vectors_configs_(std::move(q_vector_config)), + resolution_q_vectors_configs_(std::move(resolution_q_vectors_configs)) {} + + virtual Qn::DataContainer CalculateResolution(std::vector correlations){ }; + virtual std::vector>> ConstructResolutionCombinations(std::vector reff_q, std::vector q_combination){} + Qn::DataContainer ReadContainerFromFile( const std::string&, const std::pair& vectors ); + + std::string uq_directory_; + std::string qq_directory_; + VectorConfig u_vector_config_; + std::vector q_vectors_configs_; + std::vector resolution_q_vectors_configs_; + + std::vector observables_names_; + + std::vector> resolutions_; + std::vector> observables_; +}; + +#endif // OBSERVABLESCALCULATOR_SRC_METHOD_H_ diff --git a/src/QnAnalysisObservables/MethodOf3SE.cpp b/src/QnAnalysisObservables/MethodOf3SE.cpp new file mode 100644 index 00000000..f262cd2d --- /dev/null +++ b/src/QnAnalysisObservables/MethodOf3SE.cpp @@ -0,0 +1,52 @@ +// +// Created by mikhail on 10/24/20. +// + +#include "MethodOf3SE.hpp" + +Qn::DataContainer MethodOf3SE::CalculateResolution(std::vector correlations){ + auto result = Sqrt(correlations.at(0) * correlations.at(1) / correlations.at(2) ) * sqrt(2.0); + return result; +} + +void MethodOf3SE::CalculateObservables(){ + auto combinations = ConstructResolutionCombinations(q_vectors_configs_, resolution_q_vectors_configs_); + std::vector> results; + for( auto res_combination_names : combinations ){ + std::vector> set_for_res_calc; + set_for_res_calc.push_back( ReadContainerFromFile( qq_directory_, res_combination_names.at(0) ) ); + set_for_res_calc.push_back( ReadContainerFromFile( qq_directory_, res_combination_names.at(1) ) ); + set_for_res_calc.push_back( ReadContainerFromFile( qq_directory_, res_combination_names.at(2) ) ); + observables_names_.push_back( u_vector_config_.title+"."+q_vectors_configs_.front().title+"("+res_combination_names.at(2).first.title+","+res_combination_names.at(2).second.title+")" ); + resolutions_.push_back( CalculateResolution( set_for_res_calc ) ); + } + auto uq_correlation = ReadContainerFromFile( uq_directory_, std::pair(u_vector_config_, q_vectors_configs_.front()) ); + for( const auto& res : resolutions_ ){ + observables_.push_back(uq_correlation/res*2.0); + } +} + +std::vector>> MethodOf3SE::ConstructResolutionCombinations( + std::vector reff_q, std::vector q_combination){ + auto q1 = std::move(reff_q.front()); + std::vector>> combinations; + for (size_t i=0; i> combination; + combination.emplace_back(q1, q2); + combination.emplace_back(q1, q3); + combination.emplace_back(q2, q3); + combinations.push_back(combination); + } + } + return combinations; +} +MethodOf3SE::MethodOf3SE( + const VectorConfig &u_vector_config, + const std::vector &q_vector_config, + const std::vector &resolution_q_vectors_configs) + : Method(u_vector_config, q_vector_config, resolution_q_vectors_configs) {} diff --git a/src/QnAnalysisObservables/MethodOf3SE.hpp b/src/QnAnalysisObservables/MethodOf3SE.hpp new file mode 100644 index 00000000..8006cc28 --- /dev/null +++ b/src/QnAnalysisObservables/MethodOf3SE.hpp @@ -0,0 +1,29 @@ +// +// Created by mikhail on 10/24/20. +// + +#ifndef OBSERVABLESCALCULATOR_SRC_METHOD_OF_3SE_H_ +#define OBSERVABLESCALCULATOR_SRC_METHOD_OF_3SE_H_ + +#include + +#include +#include + +#include "FileManager.hpp" +#include "Method.hpp" + +class MethodOf3SE : public Method { +public: + MethodOf3SE(const VectorConfig &u_vector_config, + const std::vector &q_vector_config, + const std::vector &resolution_q_vectors_configs); + ~MethodOf3SE() override = default; + void CalculateObservables() override; + +protected: + Qn::DataContainer CalculateResolution(std::vector correlations) override; + std::vector>> ConstructResolutionCombinations(std::vector reff_q, std::vector q_combination) override; +}; + +#endif // OBSERVABLESCALCULATOR_SRC_METHOD_OF_3SE_H_ diff --git a/src/QnAnalysisObservables/calculator.cc b/src/QnAnalysisObservables/calculator.cc new file mode 100644 index 00000000..b0512cc5 --- /dev/null +++ b/src/QnAnalysisObservables/calculator.cc @@ -0,0 +1,5 @@ +// +// Created by mikhail on 10/25/20. +// + +#include "calculator.h" diff --git a/src/QnAnalysisObservables/calculator.h b/src/QnAnalysisObservables/calculator.h new file mode 100644 index 00000000..597971c6 --- /dev/null +++ b/src/QnAnalysisObservables/calculator.h @@ -0,0 +1,14 @@ +// +// Created by mikhail on 10/25/20. +// + +#ifndef OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ +#define OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ + +class Calculator { + +private: + +}; + +#endif // OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ From db0ca77b5934d1cab21cc297ab31e592b6190e70 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 27 Oct 2020 13:26:26 +0300 Subject: [PATCH 006/274] Bug in QnAnalysisObservables fixed --- setups/correlation/hades.yml | 17 +++++----- setups/hades-analysis-config.yml | 42 ++++++++++++++++++------- src/QnAnalysisObservables/Calculate.cpp | 7 +++-- src/QnAnalysisObservables/Method.cpp | 7 +++-- 4 files changed, 48 insertions(+), 25 deletions(-) diff --git a/setups/correlation/hades.yml b/setups/correlation/hades.yml index 2672c0ca..3c388633 100644 --- a/setups/correlation/hades.yml +++ b/setups/correlation/hades.yml @@ -11,16 +11,19 @@ _detectors: &detectors - name: W3 tags: [ qn_vector ] correction-step: rescaled - - name: M + - name: Mf + tags: [ qn_vector ] + correction-step: rescaled + - name: Mb tags: [ qn_vector ] correction-step: rescaled _axes: - ¢rality name: event_header_selected_tof_rpc_hits_centrality - nb: 8 + nb: 12 lo: 0 - hi: 40 + hi: 60 _components: - &sp_components @@ -42,7 +45,7 @@ _tasks: weight: ones # temporarily ignored # actions: [xx,xy,yx,yy] - n-samples: 50 + n-samples: 100 weights-type: observable # temporarily ignored # weights-function: xx @@ -61,7 +64,7 @@ _tasks: weight: ones # temporarily ignored # actions: [xx,xy,yx,yy] - n-samples: 50 + n-samples: 100 weights-type: observable # temporarily ignored # weights-function: xx @@ -81,7 +84,7 @@ _tasks: correction-steps: [ rescaled ] # temporarily ignored # actions: [xx,xy,yx,yy] - n-samples: 50 + n-samples: 100 weights-type: reference # weights-function: xx folder: "/QQ/SP" @@ -99,7 +102,7 @@ _tasks: correction-steps: [ rescaled ] # temporarily ignored # actions: [xx,xy,yx,yy] - n-samples: 50 + n-samples: 100 weights-type: reference # weights-function: xx folder: "/QQ/EP" diff --git a/setups/hades-analysis-config.yml b/setups/hades-analysis-config.yml index 97e66b32..614439b8 100644 --- a/setups/hades-analysis-config.yml +++ b/setups/hades-analysis-config.yml @@ -3,9 +3,9 @@ _layouts: _axes: - &axis_pT name: mdc_vtx_tracks/pT - nb: 16 + nb: 20 lo: 0.0 - hi: 1.6 + hi: 2.0 - &axis_rapidity name: mdc_vtx_tracks/rapidity nb: 15 @@ -14,7 +14,20 @@ _axes: _cuts: - &protons_cuts mdc_vtx_tracks/pid: { equals: 2212 } - mdc_vtx_tracks/pT: {range: [0.0, 1.6]} + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + - &mf_cuts + mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + - &mb_cuts + mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} @@ -35,7 +48,7 @@ hades_analysis: event-variables: - event_header/selected_tof_rpc_hits_centrality axes: - - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: - name: u type: track @@ -54,23 +67,28 @@ hades_analysis: - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] - - name: M + - name: Mf type: track phi: mdc_vtx_tracks/phi weight: Ones corrections: - recentering - twist-and-rescale - axes: - - *axis_rapidity cuts: - *protons_cuts -# mdc_vtx_tracks/pT: { range: [0.0, 1.6] } + *mf_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts: + *mb_cuts qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT - - *axis_rapidity - - [*axis_rapidity, *axis_pT] - name: W1 type: track phi: forward_wall_hits/phi diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index 832a361e..e8b09bb6 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -7,11 +7,12 @@ int main(){ FileManager::OpenFile( "~/Correlations/new_qn_analysis.root" ); - MethodOf3SE test_x = MethodOf3SE({"u_RESCALED", "u", "x1"}, {{"W1_RESCALED", "W1","x1"}}, + MethodOf3SE test_x = MethodOf3SE({"u_RESCALED", "u", "x1"}, + {{"W1_RESCALED", "W1","x1"}}, { {"W2_RESCALED", "W2"}, {"W3_RESCALED", "W3"}, - {"M_RESCALED", "Mb", "", {"event_header_selected_tof_rpc_centrality"}, - {{"mdc_vtx_tracks_rapidity", 1, 0.19, 0.39}}}, + {"M_RESCALED", "Mb", ""}, +// } ); test_x.SetQqDirectory("/QQ/SP"); test_x.SetUqDirectory("/uQ/SP"); diff --git a/src/QnAnalysisObservables/Method.cpp b/src/QnAnalysisObservables/Method.cpp index 656f276a..adb8759d 100644 --- a/src/QnAnalysisObservables/Method.cpp +++ b/src/QnAnalysisObservables/Method.cpp @@ -21,9 +21,10 @@ Qn::DataContainer Method::ReadContainerFromFile( const std::s result=result.Rebin( axes ); auto projection = vectors.first.projection_axes; for( const auto& axis : vectors.second.projection_axes ) - if( std::count(projection.begin(), projection.end(), axis) > 0 ) - projection.push_back(axis); - result.Projection(projection); + if( std::count(projection.begin(), projection.end(), axis) == 0 ) + projection.emplace_back(axis); + if( !std::empty(projection) ) + result = result.Projection(projection); return result; } From a22c2283e175ea98f6d17dff6faf4e782e777439 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 27 Oct 2020 23:25:31 +0300 Subject: [PATCH 007/274] Improvements in structure of QnAnalysisObservables --- setups/correlation/hades.yml | 2 +- src/QnAnalysisObservables/Calculate.cpp | 10 ++-- src/QnAnalysisObservables/Method.cpp | 67 ++++++++++++++++------- src/QnAnalysisObservables/Method.hpp | 10 +--- src/QnAnalysisObservables/MethodOf3SE.cpp | 33 +++++------ src/QnAnalysisObservables/MethodOf3SE.hpp | 7 ++- 6 files changed, 75 insertions(+), 54 deletions(-) diff --git a/setups/correlation/hades.yml b/setups/correlation/hades.yml index 3c388633..753cf136 100644 --- a/setups/correlation/hades.yml +++ b/setups/correlation/hades.yml @@ -59,7 +59,7 @@ _tasks: weight: sumw - query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors - components: *ep_components + components: *ep_components # correction-steps: [ rescaled ] weight: ones # temporarily ignored diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index e8b09bb6..7a36b08b 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -7,12 +7,12 @@ int main(){ FileManager::OpenFile( "~/Correlations/new_qn_analysis.root" ); - MethodOf3SE test_x = MethodOf3SE({"u_RESCALED", "u", "x1"}, - {{"W1_RESCALED", "W1","x1"}}, + MethodOf3SE test_x = MethodOf3SE({"u_RESCALED", "x1"}, + {{"W1_RESCALED","x1"}}, { - {"W2_RESCALED", "W2"}, {"W3_RESCALED", "W3"}, - {"M_RESCALED", "Mb", ""}, -// + {"W2_RESCALED"}, {"W3_RESCALED"}, +// {"M_RESCALED", "Mb", ""}, +//3 } ); test_x.SetQqDirectory("/QQ/SP"); test_x.SetUqDirectory("/uQ/SP"); diff --git a/src/QnAnalysisObservables/Method.cpp b/src/QnAnalysisObservables/Method.cpp index adb8759d..d0434fc9 100644 --- a/src/QnAnalysisObservables/Method.cpp +++ b/src/QnAnalysisObservables/Method.cpp @@ -4,27 +4,54 @@ #include "Method.hpp" -Qn::DataContainer Method::ReadContainerFromFile( const std::string& directory, const std::pair& vectors ){ +Qn::DataContainer Method::ReadContainerFromFile( const std::string& directory, const std::vector& vectors ){ Qn::DataContainerStatCollect* obj; - auto name = directory+"/"+vectors.first.name+"."+vectors.second.name+"."+vectors.first.component_name+vectors.second.component_name; - try { - obj = FileManager::GetObject(name); - }catch( std::runtime_error& ){ - name = vectors.second.name+"."+vectors.first.name+"."+vectors.second.component_name+vectors.first.component_name; - FileManager::GetObject(name); + std::string name = directory+"/"; + std::string component; + auto combinations = GetAllCombinations(vectors); + int n=0; + while ( n(name); + auto result = Qn::DataContainerStatCalculate(*obj); + result.SetErrors(Qn::StatCalculate::ErrorType::BOOTSTRAP); + return result; + } catch (std::runtime_error&) { + n++; + } } - auto result = Qn::DataContainerStatCalculate(*obj); - result.SetErrors(Qn::StatCalculate::ErrorType::BOOTSTRAP); - for( const auto& axes : vectors.first.rebin_axes ) - result=result.Rebin( axes ); - for( const auto& axes : vectors.second.rebin_axes ) - result=result.Rebin( axes ); - auto projection = vectors.first.projection_axes; - for( const auto& axis : vectors.second.projection_axes ) - if( std::count(projection.begin(), projection.end(), axis) == 0 ) - projection.emplace_back(axis); - if( !std::empty(projection) ) - result = result.Projection(projection); - return result; + throw std::runtime_error( "Method::ReadContainerFromFile: No such a correlation in file "+name ); } +std::vector> Method::GetAllCombinations( std::vector elements ){ + std::vector> result; + if( elements.size() == 1 ){ + result = {elements}; + return result; + } + auto el1 = elements.front(); + std::vector> prev_combinations; + elements.erase(elements.begin()); + prev_combinations=GetAllCombinations(elements); + for( size_t i=0; ij ) + result.back().emplace_back(prev_combinations.at(i).at(k-1)); + } + } + } + return result; +} diff --git a/src/QnAnalysisObservables/Method.hpp b/src/QnAnalysisObservables/Method.hpp index 9bcccfe1..c67ff727 100644 --- a/src/QnAnalysisObservables/Method.hpp +++ b/src/QnAnalysisObservables/Method.hpp @@ -12,10 +12,7 @@ struct VectorConfig { std::string name; - std::string title; std::string component_name; - std::vector projection_axes; - std::vector rebin_axes; }; class Method { @@ -31,7 +28,7 @@ class Method { void Write(){ int i=0; std::string component = u_vector_config_.component_name; - for( auto config : q_vectors_configs_){ + for( const auto& config : q_vectors_configs_){ component+=config.component_name; } for( auto resolution: resolutions_){ @@ -53,9 +50,8 @@ class Method { q_vectors_configs_(std::move(q_vector_config)), resolution_q_vectors_configs_(std::move(resolution_q_vectors_configs)) {} - virtual Qn::DataContainer CalculateResolution(std::vector correlations){ }; - virtual std::vector>> ConstructResolutionCombinations(std::vector reff_q, std::vector q_combination){} - Qn::DataContainer ReadContainerFromFile( const std::string&, const std::pair& vectors ); + static Qn::DataContainer ReadContainerFromFile( const std::string&, const std::vector& vectors ); + static std::vector> GetAllCombinations( std::vector elements ); std::string uq_directory_; std::string qq_directory_; diff --git a/src/QnAnalysisObservables/MethodOf3SE.cpp b/src/QnAnalysisObservables/MethodOf3SE.cpp index f262cd2d..b1265cbf 100644 --- a/src/QnAnalysisObservables/MethodOf3SE.cpp +++ b/src/QnAnalysisObservables/MethodOf3SE.cpp @@ -4,49 +4,46 @@ #include "MethodOf3SE.hpp" -Qn::DataContainer MethodOf3SE::CalculateResolution(std::vector correlations){ +Qn::DataContainer MethodOf3SE::CalculateResolution3SE(std::vector correlations){ auto result = Sqrt(correlations.at(0) * correlations.at(1) / correlations.at(2) ) * sqrt(2.0); return result; } void MethodOf3SE::CalculateObservables(){ - auto combinations = ConstructResolutionCombinations(q_vectors_configs_, resolution_q_vectors_configs_); + auto combinations = ConstructResolution3SECombinations(q_vectors_configs_.front(), resolution_q_vectors_configs_); std::vector> results; for( auto res_combination_names : combinations ){ std::vector> set_for_res_calc; set_for_res_calc.push_back( ReadContainerFromFile( qq_directory_, res_combination_names.at(0) ) ); set_for_res_calc.push_back( ReadContainerFromFile( qq_directory_, res_combination_names.at(1) ) ); set_for_res_calc.push_back( ReadContainerFromFile( qq_directory_, res_combination_names.at(2) ) ); - observables_names_.push_back( u_vector_config_.title+"."+q_vectors_configs_.front().title+"("+res_combination_names.at(2).first.title+","+res_combination_names.at(2).second.title+")" ); - resolutions_.push_back( CalculateResolution( set_for_res_calc ) ); + observables_names_.push_back( u_vector_config_.name+"."+q_vectors_configs_.front().name+"("+res_combination_names.at(2).front().name+","+res_combination_names.at(2).back().name+")" ); + resolutions_.push_back( CalculateResolution3SE( set_for_res_calc ) ); } - auto uq_correlation = ReadContainerFromFile( uq_directory_, std::pair(u_vector_config_, q_vectors_configs_.front()) ); + auto uq_correlation_confg = q_vectors_configs_; + uq_correlation_confg.insert(uq_correlation_confg.begin(), u_vector_config_); + auto uq_correlation = ReadContainerFromFile( uq_directory_, uq_correlation_confg ); for( const auto& res : resolutions_ ){ observables_.push_back(uq_correlation/res*2.0); } } -std::vector>> MethodOf3SE::ConstructResolutionCombinations( - std::vector reff_q, std::vector q_combination){ - auto q1 = std::move(reff_q.front()); - std::vector>> combinations; +std::vector>> MethodOf3SE::ConstructResolution3SECombinations( + VectorConfig reff_q, std::vector q_combination){ + auto q1 = std::move(reff_q); + std::vector>> combinations; for (size_t i=0; i> combination; - combination.emplace_back(q1, q2); - combination.emplace_back(q1, q3); - combination.emplace_back(q2, q3); + std::vector> combination; + combination.push_back({q1, q2}); + combination.push_back({q1, q3}); + combination.push_back({q2, q3}); combinations.push_back(combination); } } return combinations; } -MethodOf3SE::MethodOf3SE( - const VectorConfig &u_vector_config, - const std::vector &q_vector_config, - const std::vector &resolution_q_vectors_configs) - : Method(u_vector_config, q_vector_config, resolution_q_vectors_configs) {} diff --git a/src/QnAnalysisObservables/MethodOf3SE.hpp b/src/QnAnalysisObservables/MethodOf3SE.hpp index 8006cc28..ca41583c 100644 --- a/src/QnAnalysisObservables/MethodOf3SE.hpp +++ b/src/QnAnalysisObservables/MethodOf3SE.hpp @@ -17,13 +17,14 @@ class MethodOf3SE : public Method { public: MethodOf3SE(const VectorConfig &u_vector_config, const std::vector &q_vector_config, - const std::vector &resolution_q_vectors_configs); + const std::vector &resolution_q_vectors_configs) + : Method(u_vector_config, q_vector_config, resolution_q_vectors_configs) {} ~MethodOf3SE() override = default; void CalculateObservables() override; protected: - Qn::DataContainer CalculateResolution(std::vector correlations) override; - std::vector>> ConstructResolutionCombinations(std::vector reff_q, std::vector q_combination) override; + static Qn::DataContainer CalculateResolution3SE(std::vector correlations); + static std::vector>> ConstructResolution3SECombinations(VectorConfig reff_q, std::vector q_combination); }; #endif // OBSERVABLESCALCULATOR_SRC_METHOD_OF_3SE_H_ From b73f80c1f7fd5e27ea41b350063e6dccafedeed2 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 28 Oct 2020 00:23:34 +0300 Subject: [PATCH 008/274] Supervision class for Methods added --- src/QnAnalysisObservables/CMakeLists.txt | 1 + src/QnAnalysisObservables/Calculate.cpp | 15 ++-- src/QnAnalysisObservables/Method.cpp | 15 +++- src/QnAnalysisObservables/MethodOf3SE.cpp | 4 ++ .../{calculator.cc => V1Observables.cpp} | 2 +- src/QnAnalysisObservables/V1Observables.hpp | 69 +++++++++++++++++++ src/QnAnalysisObservables/calculator.h | 14 ---- 7 files changed, 99 insertions(+), 21 deletions(-) rename src/QnAnalysisObservables/{calculator.cc => V1Observables.cpp} (59%) create mode 100644 src/QnAnalysisObservables/V1Observables.hpp delete mode 100644 src/QnAnalysisObservables/calculator.h diff --git a/src/QnAnalysisObservables/CMakeLists.txt b/src/QnAnalysisObservables/CMakeLists.txt index 8a75e6b3..c7329492 100644 --- a/src/QnAnalysisObservables/CMakeLists.txt +++ b/src/QnAnalysisObservables/CMakeLists.txt @@ -2,6 +2,7 @@ set(SOURCES FileManager.cpp Method.cpp MethodOf3SE.cpp + V1Observables.cpp ) add_executable(flow Calculate.cpp ${SOURCES}) diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index 7a36b08b..c6b67ce3 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -4,6 +4,7 @@ #include "FileManager.hpp" #include "MethodOf3SE.hpp" +#include "V1Observables.hpp" int main(){ FileManager::OpenFile( "~/Correlations/new_qn_analysis.root" ); @@ -11,15 +12,19 @@ int main(){ {{"W1_RESCALED","x1"}}, { {"W2_RESCALED"}, {"W3_RESCALED"}, -// {"M_RESCALED", "Mb", ""}, + {"Mf_RESCALED"}, {"Mb_RESCALED"} //3 } ); - test_x.SetQqDirectory("/QQ/SP"); - test_x.SetUqDirectory("/uQ/SP"); - test_x.CalculateObservables(); + V1Observables obs( V1Observables::METHODS::MethodOf3SE ); + obs.SetUvectors("u_RESCALED", {"x1", "y1"}); + obs.SetEPvectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED"}, {"x1", "y1"}); + obs.SetResolutionVectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED", "Mf_RESCALED", "Mb_RESCALED"}); + obs.SetQqCorrelationsDirectory("/QQ/SP"); + obs.SetUqCorrelationsDirectory("/uQ/SP"); + obs.Calculate(); auto file_out = TFile::Open("out.root", "recreate"); file_out->cd(); - test_x.Write(); + obs.Write(); file_out->Close(); return 0; diff --git a/src/QnAnalysisObservables/Method.cpp b/src/QnAnalysisObservables/Method.cpp index d0434fc9..47e9970d 100644 --- a/src/QnAnalysisObservables/Method.cpp +++ b/src/QnAnalysisObservables/Method.cpp @@ -6,8 +6,21 @@ Qn::DataContainer Method::ReadContainerFromFile( const std::string& directory, const std::vector& vectors ){ Qn::DataContainerStatCollect* obj; - std::string name = directory+"/"; + std::string name; std::string component; + try{ + name = directory+"/"; + component.clear(); + for (const auto& vector : vectors) { + name += vector.name+"."; + component += vector.component_name; + } + name+=component; + obj = FileManager::GetObject(name); + auto result = Qn::DataContainerStatCalculate(*obj); + result.SetErrors(Qn::StatCalculate::ErrorType::BOOTSTRAP); + return result; + } catch (std::exception&) {} auto combinations = GetAllCombinations(vectors); int n=0; while ( n>> MethodOf3SE::ConstructResolu std::vector>> combinations; for (size_t i=0; i> combination; combination.push_back({q1, q2}); diff --git a/src/QnAnalysisObservables/calculator.cc b/src/QnAnalysisObservables/V1Observables.cpp similarity index 59% rename from src/QnAnalysisObservables/calculator.cc rename to src/QnAnalysisObservables/V1Observables.cpp index b0512cc5..4e56b46c 100644 --- a/src/QnAnalysisObservables/calculator.cc +++ b/src/QnAnalysisObservables/V1Observables.cpp @@ -2,4 +2,4 @@ // Created by mikhail on 10/25/20. // -#include "calculator.h" +#include "V1Observables.hpp" diff --git a/src/QnAnalysisObservables/V1Observables.hpp b/src/QnAnalysisObservables/V1Observables.hpp new file mode 100644 index 00000000..6645f8ae --- /dev/null +++ b/src/QnAnalysisObservables/V1Observables.hpp @@ -0,0 +1,69 @@ +// +// Created by mikhail on 10/25/20. +// + +#ifndef OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ +#define OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ + +#include "Method.hpp" +#include "MethodOf3SE.hpp" +#include +#include +class V1Observables { + public: + enum class METHODS{ + MethodOf3SE + }; + explicit V1Observables(METHODS method_type) : method_type_(method_type) {} + virtual ~V1Observables() = default; + void SetUvectors( std::string name, std::vector components ){ + u_vector_name_ = std::move(name); + u_vector_components_ = std::move(components); + } + void SetEPvectors( std::vector names, std::vector components ){ + ep_vectors_names_ = std::move(names); + ep_vectors_components_ = std::move(components); + } + void SetResolutionVectors( std::vector names){ + resolution_q_vectors_ = std::move(names); + } + void SetUqCorrelationsDirectory(const std::string& uq_correlations_directory) { + uq_correlations_directory_ = uq_correlations_directory; + } + void SetQqCorrelationsDirectory(const std::string& qq_correlations_directory) { + qq_correlations_directory_ = qq_correlations_directory; + } + void Calculate(){ + std::vector resolution_qs; + for( const auto& name : resolution_q_vectors_ ){ + resolution_qs.push_back({name}); + } + for( const auto& component : u_vector_components_ ) + for( const auto& ep_vector : ep_vectors_names_ ) + for (const auto& ep_component : ep_vectors_components_) { + methods_.emplace_back(new MethodOf3SE( + {u_vector_name_, component}, {{ep_vector, ep_component}}, resolution_qs)); + methods_.back()->SetQqDirectory(qq_correlations_directory_); + methods_.back()->SetUqDirectory(uq_correlations_directory_); + } + for( auto method : methods_ ) + method->CalculateObservables(); + } + void Write(){ + for( auto method : methods_ ) + method->Write(); + } + + private: + std::vector methods_; + METHODS method_type_; + std::string uq_correlations_directory_; + std::string qq_correlations_directory_; + std::string u_vector_name_; + std::vector u_vector_components_; + std::vector ep_vectors_names_; + std::vector ep_vectors_components_; + std::vector resolution_q_vectors_; +}; + +#endif // OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ diff --git a/src/QnAnalysisObservables/calculator.h b/src/QnAnalysisObservables/calculator.h deleted file mode 100644 index 597971c6..00000000 --- a/src/QnAnalysisObservables/calculator.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Created by mikhail on 10/25/20. -// - -#ifndef OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ -#define OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ - -class Calculator { - -private: - -}; - -#endif // OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ From 9b94ef0e237de2e1008d20ed9162997a3a0ccb2f Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 3 Nov 2020 17:34:00 +0300 Subject: [PATCH 009/274] EP method added --- src/QnAnalysisObservables/Calculate.cpp | 29 +++++++++++++++++-------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index c6b67ce3..a65903b8 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -15,16 +15,27 @@ int main(){ {"Mf_RESCALED"}, {"Mb_RESCALED"} //3 } ); - V1Observables obs( V1Observables::METHODS::MethodOf3SE ); - obs.SetUvectors("u_RESCALED", {"x1", "y1"}); - obs.SetEPvectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED"}, {"x1", "y1"}); - obs.SetResolutionVectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED", "Mf_RESCALED", "Mb_RESCALED"}); - obs.SetQqCorrelationsDirectory("/QQ/SP"); - obs.SetUqCorrelationsDirectory("/uQ/SP"); - obs.Calculate(); + V1Observables obs_sp( V1Observables::METHODS::MethodOf3SE ); + obs_sp.SetUvectors("u_RESCALED", {"x1", "y1"}); + obs_sp.SetEPvectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED"}, {"x1", "y1"}); + obs_sp.SetResolutionVectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED", "Mf_RESCALED", "Mb_RESCALED"}); + obs_sp.SetQqCorrelationsDirectory("/QQ/SP"); + obs_sp.SetUqCorrelationsDirectory("/uQ/SP"); + obs_sp.Calculate(); + V1Observables obs_ep( V1Observables::METHODS::MethodOf3SE ); + obs_ep.SetUvectors("u_RESCALED", {"x1", "y1"}); + obs_ep.SetEPvectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED"}, {"cos1", "sin1"}); + obs_ep.SetResolutionVectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED", "Mf_RESCALED", "Mb_RESCALED"}); + obs_ep.SetQqCorrelationsDirectory("/QQ/EP"); + obs_ep.SetUqCorrelationsDirectory("/uQ/EP"); + obs_ep.Calculate(); auto file_out = TFile::Open("out.root", "recreate"); - file_out->cd(); - obs.Write(); + file_out->mkdir("SP"); + file_out->cd("/SP"); + obs_sp.Write(); + file_out->mkdir("EP"); + file_out->cd("/EP"); + obs_ep.Write(); file_out->Close(); return 0; From 3818d7f912fab616b17d82f9f807724903d0e4f7 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 5 Nov 2020 12:25:59 +0300 Subject: [PATCH 010/274] configs with multiplicity axis --- setups/correlation/hades-mult.yml | 107 +++++++++++++++++++++++ setups/hades-analysis-config-mult.yml | 118 ++++++++++++++++++++++++++ 2 files changed, 225 insertions(+) create mode 100644 setups/correlation/hades-mult.yml create mode 100644 setups/hades-analysis-config-mult.yml diff --git a/setups/correlation/hades-mult.yml b/setups/correlation/hades-mult.yml new file mode 100644 index 00000000..74f6ce3f --- /dev/null +++ b/setups/correlation/hades-mult.yml @@ -0,0 +1,107 @@ +_detectors: &detectors + - name: u + tags: [ un_vector ] + correction-step: rescaled + - name: W1 + tags: [ qn_vector ] + correction-step: rescaled + - name: W2 + tags: [ qn_vector ] + correction-step: rescaled + - name: W3 + tags: [ qn_vector ] + correction-step: rescaled + - name: Mf + tags: [ qn_vector ] + correction-step: rescaled + - name: Mb + tags: [ qn_vector ] + correction-step: rescaled + +_axes: + - &multiplicity + name: event_header_selected_tof_rpc_hits + bin-edges: [0, 10, 17, 23, 29, 36, 45, 55, 68, 82, 99, 117, 136, 157, 180, 312, 499] + +_components: + - &sp_components + [ x1,y1 ] + - &ep_components + [ cos1,sin1 ] + +_tasks: + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + # temporarily ignored + # actions: [xx,xy,yx,yy] + n-samples: 100 + weights-type: observable + # temporarily ignored + # weights-function: xx + folder: "/uQ/SP" + axes: [ *multiplicity ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components # + correction-steps: [ rescaled ] + weight: ones + # temporarily ignored + # actions: [xx,xy,yx,yy] + n-samples: 100 + weights-type: observable + # temporarily ignored + # weights-function: xx + folder: "/uQ/EP" + axes: [ *multiplicity ] + # Reference x Reference + - args: + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + # what are the Q-vector components participating in the correlation + components: *sp_components + # what corrections steps are participating in the correlation + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + # temporarily ignored + # actions: [xx,xy,yx,yy] + n-samples: 100 + weights-type: reference + # weights-function: xx + folder: "/QQ/SP" + axes: [ *multiplicity ] + - args: + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + # what are the Q-vector components participating in the correlation + components: *ep_components + # what corrections steps are participating in the correlation + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + # temporarily ignored + # actions: [xx,xy,yx,yy] + n-samples: 100 + weights-type: reference + # weights-function: xx + folder: "/QQ/EP" + axes: [ *multiplicity ] \ No newline at end of file diff --git a/setups/hades-analysis-config-mult.yml b/setups/hades-analysis-config-mult.yml new file mode 100644 index 00000000..802e05f0 --- /dev/null +++ b/setups/hades-analysis-config-mult.yml @@ -0,0 +1,118 @@ +_layouts: + +_axes: + - &axis_pT + name: mdc_vtx_tracks/pT + nb: 20 + lo: 0.0 + hi: 2.0 + - &axis_rapidity + name: mdc_vtx_tracks/rapidity + nb: 15 + lo: -0.01 + hi: 1.49 +_cuts: + - &protons_cuts + mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + - &mf_cuts + mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + - &mb_cuts + mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/beta: { range: [0.84, 1.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/beta: { range: [0.85, 1.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/beta: { range: [0.80, 1.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits + axes: + - { name: event_header/selected_tof_rpc_hits, bin-edges: [0, 10, 17, 23, 29, 36, 45, 55, 68, 82, 99, 117, 136, 157, 180, 312, 499] } + q-vectors: + - name: u + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT + - *axis_rapidity + cuts: + *protons_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT + - *axis_rapidity + - [*axis_rapidity, *axis_pT] + - name: Mf + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts: + *mf_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts: + *mb_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: W1 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w1_cuts + - name: W2 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w2_cuts + - name: W3 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w3_cuts \ No newline at end of file From 6b4b72fcce06dc201030aac0f044807620bb3a5f Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 7 Nov 2020 16:11:56 +0300 Subject: [PATCH 011/274] restructure --- cmake_modules/QnTools.cmake | 2 +- setups/hades/correction-agag-123.yml | 118 ++++++++++++++++++ .../correction-auau-123-mult.yml} | 0 .../correction-auau-123.yml} | 0 .../correlation-mult.yml} | 0 .../hades.yml => hades/correlation.yml} | 18 --- src/QnAnalysisObservables/Calculate.cpp | 2 +- 7 files changed, 120 insertions(+), 20 deletions(-) create mode 100644 setups/hades/correction-agag-123.yml rename setups/{hades-analysis-config-mult.yml => hades/correction-auau-123-mult.yml} (100%) rename setups/{hades-analysis-config.yml => hades/correction-auau-123.yml} (100%) rename setups/{correlation/hades-mult.yml => hades/correlation-mult.yml} (100%) rename setups/{correlation/hades.yml => hades/correlation.yml} (77%) diff --git a/cmake_modules/QnTools.cmake b/cmake_modules/QnTools.cmake index 8f78f526..12b5fe0d 100644 --- a/cmake_modules/QnTools.cmake +++ b/cmake_modules/QnTools.cmake @@ -5,7 +5,7 @@ find_package(QnTools QUIET) include(FetchContent) FetchContent_Declare(QnTools GIT_REPOSITORY https://github.com/HeavyIonAnalysis/QnTools.git - GIT_TAG "v0.0.1" + GIT_TAG "master" UPDATE_DISCONNECTED ${UPDATE_DISCONNECTED} ) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml new file mode 100644 index 00000000..4f5e3e62 --- /dev/null +++ b/setups/hades/correction-agag-123.yml @@ -0,0 +1,118 @@ +_layouts: + +_axes: + - &axis_pT + name: mdc_vtx_tracks/pT + nb: 20 + lo: 0.0 + hi: 2.0 + - &axis_rapidity + name: mdc_vtx_tracks/rapidity + nb: 15 + lo: -0.01 + hi: 1.49 +_cuts: + - &protons_cuts + mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + - &mf_cuts + mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + - &mb_cuts + mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/time: { range: [22.681788, 27.002128] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/time: { range: [22.681788, 26.684456] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: + - name: u + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT + - *axis_rapidity + cuts: + *protons_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT + - *axis_rapidity + - [*axis_rapidity, *axis_pT] + - name: Mf + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts: + *mf_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts: + *mb_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: W1 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w1_cuts + - name: W2 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w2_cuts + - name: W3 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w3_cuts \ No newline at end of file diff --git a/setups/hades-analysis-config-mult.yml b/setups/hades/correction-auau-123-mult.yml similarity index 100% rename from setups/hades-analysis-config-mult.yml rename to setups/hades/correction-auau-123-mult.yml diff --git a/setups/hades-analysis-config.yml b/setups/hades/correction-auau-123.yml similarity index 100% rename from setups/hades-analysis-config.yml rename to setups/hades/correction-auau-123.yml diff --git a/setups/correlation/hades-mult.yml b/setups/hades/correlation-mult.yml similarity index 100% rename from setups/correlation/hades-mult.yml rename to setups/hades/correlation-mult.yml diff --git a/setups/correlation/hades.yml b/setups/hades/correlation.yml similarity index 77% rename from setups/correlation/hades.yml rename to setups/hades/correlation.yml index 753cf136..a66573b1 100644 --- a/setups/correlation/hades.yml +++ b/setups/hades/correlation.yml @@ -43,12 +43,8 @@ _tasks: components: *sp_components correction-steps: [ rescaled ] weight: ones - # temporarily ignored - # actions: [xx,xy,yx,yy] n-samples: 100 weights-type: observable - # temporarily ignored - # weights-function: xx folder: "/uQ/SP" axes: [ *centrality ] - args: @@ -62,48 +58,34 @@ _tasks: components: *ep_components # correction-steps: [ rescaled ] weight: ones - # temporarily ignored - # actions: [xx,xy,yx,yy] n-samples: 100 weights-type: observable - # temporarily ignored - # weights-function: xx folder: "/uQ/EP" axes: [ *centrality ] # Reference x Reference - args: - query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors - # what are the Q-vector components participating in the correlation components: *sp_components - # what corrections steps are participating in the correlation correction-steps: [ rescaled ] - query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components correction-steps: [ rescaled ] - # temporarily ignored - # actions: [xx,xy,yx,yy] n-samples: 100 weights-type: reference - # weights-function: xx folder: "/QQ/SP" axes: [ *centrality ] - args: - query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors - # what are the Q-vector components participating in the correlation components: *ep_components - # what corrections steps are participating in the correlation correction-steps: [ rescaled ] - query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *ep_components correction-steps: [ rescaled ] - # temporarily ignored - # actions: [xx,xy,yx,yy] n-samples: 100 weights-type: reference - # weights-function: xx folder: "/QQ/EP" axes: [ *centrality ] \ No newline at end of file diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index a65903b8..f5bfcb65 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -7,7 +7,7 @@ #include "V1Observables.hpp" int main(){ - FileManager::OpenFile( "~/Correlations/new_qn_analysis.root" ); + FileManager::OpenFile( "~/Correlations/auau_mult.root" ); MethodOf3SE test_x = MethodOf3SE({"u_RESCALED", "x1"}, {{"W1_RESCALED","x1"}}, { From 21f5ee5dd2d175739f5478925519c659465852cb Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 11 Nov 2020 19:18:28 +0300 Subject: [PATCH 012/274] Correction config changed: - New Q-vectors - Binning in pT-axis changed --- setups/hades/correction-auau-123.yml | 97 +++++++++++++++++++++---- setups/hades/correlation.yml | 16 +++- src/QnAnalysisObservables/Calculate.cpp | 2 +- 3 files changed, 96 insertions(+), 19 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 614439b8..f360da13 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -3,9 +3,7 @@ _layouts: _axes: - &axis_pT name: mdc_vtx_tracks/pT - nb: 20 - lo: 0.0 - hi: 2.0 + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity name: mdc_vtx_tracks/rapidity nb: 15 @@ -14,23 +12,20 @@ _axes: _cuts: - &protons_cuts mdc_vtx_tracks/pid: { equals: 2212 } + - &pion_plus_cuts + mdc_vtx_tracks/pid: { equals: 211 } + - &pion_minus_cuts + mdc_vtx_tracks/pid: { equals: -211 } + - &good_particle_cuts mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} - &mf_cuts - mdc_vtx_tracks/pid: { equals: 2212 } mdc_vtx_tracks/pT: {range: [0.0, 2.0]} mdc_vtx_tracks/rapidity: {range: [1.09, 1.29]} - mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} - &mb_cuts - mdc_vtx_tracks/pid: { equals: 2212 } mdc_vtx_tracks/pT: {range: [0.0, 2.0]} mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} - mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} - &w1_cuts forward_wall_hits/ring: { range: [1.0, 5.0] } forward_wall_hits/beta: { range: [0.84, 1.0] } @@ -60,33 +55,103 @@ hades_analysis: axes: - *axis_pT - *axis_rapidity - cuts: + cuts-pid: *protons_cuts + cuts-quality: + *good_particle_cuts qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] - - name: Mf + - name: Mf_protons type: track phi: mdc_vtx_tracks/phi weight: Ones corrections: - recentering - twist-and-rescale - cuts: + cuts-subevent: *mf_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *protons_cuts qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mb + - name: Mb_protons type: track phi: mdc_vtx_tracks/phi weight: Ones corrections: - recentering - twist-and-rescale - cuts: + cuts-subevent: + *mb_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *protons_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mf_pi_plus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mf_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_plus_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb_pi_plus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mb_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_plus_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mf_pi_minus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mf_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_minus_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb_pi_minus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: *mb_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_minus_cuts qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - name: W1 diff --git a/setups/hades/correlation.yml b/setups/hades/correlation.yml index a66573b1..f1b1bbb3 100644 --- a/setups/hades/correlation.yml +++ b/setups/hades/correlation.yml @@ -11,10 +11,22 @@ _detectors: &detectors - name: W3 tags: [ qn_vector ] correction-step: rescaled - - name: Mf + - name: Mf_protons tags: [ qn_vector ] correction-step: rescaled - - name: Mb + - name: Mb_protons + tags: [ qn_vector ] + correction-step: rescaled + - name: Mf_pi_plus + tags: [ qn_vector ] + correction-step: rescaled + - name: Mb_pi_plus + tags: [ qn_vector ] + correction-step: rescaled + - name: Mf_pi_minus + tags: [ qn_vector ] + correction-step: rescaled + - name: Mb_pi_minus tags: [ qn_vector ] correction-step: rescaled diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index f5bfcb65..c60954f2 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -7,7 +7,7 @@ #include "V1Observables.hpp" int main(){ - FileManager::OpenFile( "~/Correlations/auau_mult.root" ); + FileManager::OpenFile( "~/Correlations/new_qn_analysis_auau_pt2.root" ); MethodOf3SE test_x = MethodOf3SE({"u_RESCALED", "x1"}, {{"W1_RESCALED","x1"}}, { From 352d9d57f8bc74a77153cc8fbef9469d9df2965c Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 12 Nov 2020 11:21:59 +0300 Subject: [PATCH 013/274] Macros for Ag+Ag updated --- setups/hades/correction-agag-123.yml | 93 ++++++++++-- setups/hades/correction-agag-158.yml | 183 ++++++++++++++++++++++++ src/QnAnalysisObservables/Calculate.cpp | 34 +++-- 3 files changed, 287 insertions(+), 23 deletions(-) create mode 100644 setups/hades/correction-agag-158.yml diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 4f5e3e62..82ac0b08 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -14,23 +14,20 @@ _axes: _cuts: - &protons_cuts mdc_vtx_tracks/pid: { equals: 2212 } + - &pion_plus_cuts + mdc_vtx_tracks/pid: { equals: 211 } + - &pion_minus_cuts + mdc_vtx_tracks/pid: { equals: -211 } + - &good_particle_cuts mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} - &mf_cuts - mdc_vtx_tracks/pid: { equals: 2212 } mdc_vtx_tracks/pT: {range: [0.0, 2.0]} mdc_vtx_tracks/rapidity: {range: [1.09, 1.29]} - mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} - &mb_cuts - mdc_vtx_tracks/pid: { equals: 2212 } mdc_vtx_tracks/pT: {range: [0.0, 2.0]} mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} - mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} - &w1_cuts forward_wall_hits/ring: { range: [1.0, 5.0] } forward_wall_hits/time: { range: [22.681788, 27.002128] } @@ -60,33 +57,103 @@ hades_analysis: axes: - *axis_pT - *axis_rapidity - cuts: + cuts-pid: *protons_cuts + cuts-quality: + *good_particle_cuts qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] - - name: Mf + - name: Mf_protons type: track phi: mdc_vtx_tracks/phi weight: Ones corrections: - recentering - twist-and-rescale - cuts: + cuts-subevent: *mf_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *protons_cuts qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mb + - name: Mb_protons type: track phi: mdc_vtx_tracks/phi weight: Ones corrections: - recentering - twist-and-rescale - cuts: + cuts-subevent: + *mb_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *protons_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mf_pi_plus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mf_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_plus_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb_pi_plus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mb_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_plus_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mf_pi_minus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mf_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_minus_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb_pi_minus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: *mb_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_minus_cuts qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - name: W1 diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml new file mode 100644 index 00000000..f77d4681 --- /dev/null +++ b/setups/hades/correction-agag-158.yml @@ -0,0 +1,183 @@ +_layouts: + +_axes: + - &axis_pT + name: mdc_vtx_tracks/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_rapidity + name: mdc_vtx_tracks/rapidity + nb: 15 + lo: 0.07 + hi: 1.57 +_cuts: + - &protons_cuts + mdc_vtx_tracks/pid: { equals: 2212 } + - &pion_plus_cuts + mdc_vtx_tracks/pid: { equals: 211 } + - &pion_minus_cuts + mdc_vtx_tracks/pid: { equals: -211 } + - &good_particle_cuts + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + - &mf_cuts + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [1.17, 1.37]} + - &mb_cuts + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [0.27, 0.47]} + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/time: { range: [22.681788, 27.002128] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/time: { range: [22.681788, 26.684456] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: + - name: u + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT + - *axis_rapidity + cuts-pid: + *protons_cuts + cuts-quality: + *good_particle_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT + - *axis_rapidity + - [*axis_rapidity, *axis_pT] + - name: Mf_protons + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mf_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *protons_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb_protons + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mb_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *protons_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mf_pi_plus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mf_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_plus_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb_pi_plus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mb_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_plus_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mf_pi_minus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mf_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_minus_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb_pi_minus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mb_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *pion_minus_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - name: W1 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w1_cuts + - name: W2 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w2_cuts + - name: W3 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w3_cuts \ No newline at end of file diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index c60954f2..a7d5863a 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -7,25 +7,39 @@ #include "V1Observables.hpp" int main(){ - FileManager::OpenFile( "~/Correlations/new_qn_analysis_auau_pt2.root" ); - MethodOf3SE test_x = MethodOf3SE({"u_RESCALED", "x1"}, - {{"W1_RESCALED","x1"}}, - { - {"W2_RESCALED"}, {"W3_RESCALED"}, - {"Mf_RESCALED"}, {"Mb_RESCALED"} -//3 - } ); + FileManager::OpenFile( "~/Correlations/auau_2020_11_11.root" ); + V1Observables obs_sp( V1Observables::METHODS::MethodOf3SE ); obs_sp.SetUvectors("u_RESCALED", {"x1", "y1"}); obs_sp.SetEPvectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED"}, {"x1", "y1"}); - obs_sp.SetResolutionVectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED", "Mf_RESCALED", "Mb_RESCALED"}); + obs_sp.SetResolutionVectors({ + "W1_RESCALED", + "W2_RESCALED", + "W3_RESCALED", + "Mf_protons_RESCALED", + "Mb_protons_RESCALED", + "Mf_pi_plus_RESCALED", + "Mb_pi_plus_RESCALED", + "Mf_pi_minus_RESCALED", + "Mb_pi_minus_RESCALED", + }); obs_sp.SetQqCorrelationsDirectory("/QQ/SP"); obs_sp.SetUqCorrelationsDirectory("/uQ/SP"); obs_sp.Calculate(); V1Observables obs_ep( V1Observables::METHODS::MethodOf3SE ); obs_ep.SetUvectors("u_RESCALED", {"x1", "y1"}); obs_ep.SetEPvectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED"}, {"cos1", "sin1"}); - obs_ep.SetResolutionVectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED", "Mf_RESCALED", "Mb_RESCALED"}); + obs_ep.SetResolutionVectors({ + "W1_RESCALED", + "W2_RESCALED", + "W3_RESCALED", + "Mf_protons_RESCALED", + "Mb_protons_RESCALED", + "Mf_pi_plus_RESCALED", + "Mb_pi_plus_RESCALED", + "Mf_pi_minus_RESCALED", + "Mb_pi_minus_RESCALED", + }); obs_ep.SetQqCorrelationsDirectory("/QQ/EP"); obs_ep.SetUqCorrelationsDirectory("/uQ/EP"); obs_ep.Calculate(); From 018fa1aaa53bd58fe87ede0ecea3b7e44456e8e0 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 12 Nov 2020 11:25:43 +0300 Subject: [PATCH 014/274] pT axis binnig changed --- setups/hades/correction-agag-123.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 82ac0b08..6cd46616 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -3,9 +3,7 @@ _layouts: _axes: - &axis_pT name: mdc_vtx_tracks/pT - nb: 20 - lo: 0.0 - hi: 2.0 + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity name: mdc_vtx_tracks/rapidity nb: 15 From c5e36ca84bd07ce74f5f033ae69b3993684ee5de Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 12 Nov 2020 23:03:56 +0300 Subject: [PATCH 015/274] Example of yaml-config file for observables calculation --- setups/observables-calculation-config.yml | 20 ++++++++++++++++++++ src/QnAnalysisObservables/Calculate.cpp | 5 ++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 setups/observables-calculation-config.yml diff --git a/setups/observables-calculation-config.yml b/setups/observables-calculation-config.yml new file mode 100644 index 00000000..adf54372 --- /dev/null +++ b/setups/observables-calculation-config.yml @@ -0,0 +1,20 @@ +_detectors: &detectors + - name: detectorI + components: [cos1,sin1] + tags: [group-A] + correction-step: rescaled + - name: detectorII + components: [x1,y1] + tags: [group-B] + correction-step: recentered + - name: detectorIII + components: [x1,y1] + tags: [group-B] + correction-step: plain + +_observables: + - observable-for-v1: + u-vector: {name: u, components: [x1, y1], correction-step: rescaled} + EP-vectors: { tags: { any-in: [ group-A ] } } + Q-vectors: { tags: { any-in: [ group-B ] } } + folder: "A" \ No newline at end of file diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index a7d5863a..39656a9d 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -3,11 +3,10 @@ // #include "FileManager.hpp" -#include "MethodOf3SE.hpp" #include "V1Observables.hpp" int main(){ - FileManager::OpenFile( "~/Correlations/auau_2020_11_11.root" ); + FileManager::OpenFile( "~/Correlations/agag158_2020_11_12.root" ); V1Observables obs_sp( V1Observables::METHODS::MethodOf3SE ); obs_sp.SetUvectors("u_RESCALED", {"x1", "y1"}); @@ -43,7 +42,7 @@ int main(){ obs_ep.SetQqCorrelationsDirectory("/QQ/EP"); obs_ep.SetUqCorrelationsDirectory("/uQ/EP"); obs_ep.Calculate(); - auto file_out = TFile::Open("out.root", "recreate"); + auto file_out = TFile::Open("agag-158-2020-11-12.root", "recreate"); file_out->mkdir("SP"); file_out->cd("/SP"); obs_sp.Write(); From 2d1a28d6f5c270fc87c9ec46c45466e90b739c5f Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 18 Nov 2020 21:23:12 +0300 Subject: [PATCH 016/274] RND-sub method added to Ag+Ag --- setups/hades/correction-agag-158.yml | 70 ++++++----------------- setups/hades/correlation.yml | 74 +++++++++++++++++++++---- src/QnAnalysisObservables/Calculate.cpp | 4 +- 3 files changed, 82 insertions(+), 66 deletions(-) diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index f77d4681..a0b5ca91 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -26,6 +26,14 @@ _cuts: - &mb_cuts mdc_vtx_tracks/pT: {range: [0.0, 2.0]} mdc_vtx_tracks/rapidity: {range: [0.27, 0.47]} + - &r1_cuts + forward_wall_hits/rnd_sub: { equals: 0 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &r2_cuts + forward_wall_hits/rnd_sub: { equals: 1 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } - &w1_cuts forward_wall_hits/ring: { range: [1.0, 5.0] } forward_wall_hits/time: { range: [22.681788, 27.002128] } @@ -94,66 +102,24 @@ hades_analysis: *protons_cuts qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mf_pi_plus - type: track - phi: mdc_vtx_tracks/phi - weight: Ones - corrections: - - recentering - - twist-and-rescale - cuts-subevent: - *mf_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_plus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mb_pi_plus - type: track - phi: mdc_vtx_tracks/phi - weight: Ones - corrections: - - recentering - - twist-and-rescale - cuts-subevent: - *mb_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_plus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mf_pi_minus + - name: R1 type: track - phi: mdc_vtx_tracks/phi - weight: Ones + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal corrections: - recentering - twist-and-rescale - cuts-subevent: - *mf_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_minus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mb_pi_minus + cuts: + *r1_cuts + - name: R2 type: track - phi: mdc_vtx_tracks/phi - weight: Ones + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal corrections: - recentering - twist-and-rescale - cuts-subevent: - *mb_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_minus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + cuts: + *r2_cuts - name: W1 type: track phi: forward_wall_hits/phi diff --git a/setups/hades/correlation.yml b/setups/hades/correlation.yml index f1b1bbb3..43ee1f77 100644 --- a/setups/hades/correlation.yml +++ b/setups/hades/correlation.yml @@ -11,22 +11,16 @@ _detectors: &detectors - name: W3 tags: [ qn_vector ] correction-step: rescaled - - name: Mf_protons - tags: [ qn_vector ] - correction-step: rescaled - - name: Mb_protons - tags: [ qn_vector ] - correction-step: rescaled - - name: Mf_pi_plus - tags: [ qn_vector ] + - name: R1 + tags: [ rnd_vector ] correction-step: rescaled - - name: Mb_pi_plus - tags: [ qn_vector ] + - name: R2 + tags: [ rnd_vector ] correction-step: rescaled - - name: Mf_pi_minus + - name: Mf_protons tags: [ qn_vector ] correction-step: rescaled - - name: Mb_pi_minus + - name: Mb_protons tags: [ qn_vector ] correction-step: rescaled @@ -59,6 +53,21 @@ _tasks: weights-type: observable folder: "/uQ/SP" axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/SP" + axes: [ *centrality ] - args: - query: { tags: { any-in: [ un_vector ] } } query-list: *detectors @@ -74,6 +83,21 @@ _tasks: weights-type: observable folder: "/uQ/EP" axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components # + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/EP" + axes: [ *centrality ] # Reference x Reference - args: - query: { tags: { any-in: [ qn_vector ] } } @@ -88,6 +112,19 @@ _tasks: weights-type: reference folder: "/QQ/SP" axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/SP" + axes: [ *centrality ] - args: - query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors @@ -100,4 +137,17 @@ _tasks: n-samples: 100 weights-type: reference folder: "/QQ/EP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/EP" axes: [ *centrality ] \ No newline at end of file diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index 39656a9d..8c47f4de 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -6,7 +6,7 @@ #include "V1Observables.hpp" int main(){ - FileManager::OpenFile( "~/Correlations/agag158_2020_11_12.root" ); + FileManager::OpenFile( "~/Correlations/agag123_2020_11_12.root" ); V1Observables obs_sp( V1Observables::METHODS::MethodOf3SE ); obs_sp.SetUvectors("u_RESCALED", {"x1", "y1"}); @@ -42,7 +42,7 @@ int main(){ obs_ep.SetQqCorrelationsDirectory("/QQ/EP"); obs_ep.SetUqCorrelationsDirectory("/uQ/EP"); obs_ep.Calculate(); - auto file_out = TFile::Open("agag-158-2020-11-12.root", "recreate"); + auto file_out = TFile::Open("agag-123-2020-11-12.root", "recreate"); file_out->mkdir("SP"); file_out->cd("/SP"); obs_sp.Write(); From e6da8d157e85fd0ab518fe8f281a772714960b6e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 23 Nov 2020 13:49:08 +0300 Subject: [PATCH 017/274] RS method added --- setups/hades/mc-correction-auau-123.yml | 77 +++++++++++++++++++++ setups/hades/mc-correlation.yml | 55 +++++++++++++++ src/QnAnalysisObservables/CMakeLists.txt | 2 +- src/QnAnalysisObservables/Calculate.cpp | 20 +++--- src/QnAnalysisObservables/Method.hpp | 6 +- src/QnAnalysisObservables/MethodOf3SE.cpp | 6 +- src/QnAnalysisObservables/MethodOfRS.cpp | 22 ++++++ src/QnAnalysisObservables/MethodOfRS.hpp | 17 +++++ src/QnAnalysisObservables/V1Observables.hpp | 24 +++++-- 9 files changed, 206 insertions(+), 23 deletions(-) create mode 100644 setups/hades/mc-correction-auau-123.yml create mode 100644 setups/hades/mc-correlation.yml create mode 100644 src/QnAnalysisObservables/MethodOfRS.cpp create mode 100644 src/QnAnalysisObservables/MethodOfRS.hpp diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml new file mode 100644 index 00000000..3ce7f592 --- /dev/null +++ b/setups/hades/mc-correction-auau-123.yml @@ -0,0 +1,77 @@ +_layouts: + +_axes: + - &axis_pT + name: mdc_vtx_tracks/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_gen_pT + name: sim_tracks/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_rapidity + name: mdc_vtx_tracks/rapidity + nb: 15 + lo: -0.01 + hi: 1.49 + - &axis_gen_rapidity + name: sim_tracks/rapidity + nb: 15 + lo: -0.01 + hi: 1.49 +_cuts: + - &pid_cut + mdc_vtx_tracks/pid: { equals: 2212 } + - &gen_prim_cut + sim_tracks/pid: { equals: 2212 } + sim_tracks/is_primary: { equals: 1 } + - &good_track_cuts + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: + - name: pid + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT + - *axis_rapidity + cuts-pid: + *pid_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT + - *axis_rapidity + - [*axis_rapidity, *axis_pT] +########################################################################### + - name: gen_prim + type: track + phi: sim_tracks/phi + weight: Ones + axes: + - *axis_gen_pT + - *axis_gen_rapidity + cuts-pid: + *gen_prim_cut + qa: + - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_pT + - *axis_gen_rapidity + - [*axis_gen_rapidity, *axis_gen_pT] +########################################################################### + - name: psi + type: psi + phi: sim_header/reaction_plane +# weight: Ones +# qa: +# - {name: sim_header/reaction_plane, nb: 320, lo: -3.2, hi: 3.2} \ No newline at end of file diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml new file mode 100644 index 00000000..e9f8256a --- /dev/null +++ b/setups/hades/mc-correlation.yml @@ -0,0 +1,55 @@ +_detectors: &detectors + - name: pid + tags: [ un_vector ] + correction-step: rescaled + - name: gen_prim + tags: [ gen_un_vector ] + correction-step: plain + - name: psi + tags: [ qn_vector ] + correction-step: plain + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + - &ep_components + [ cos1,sin1 ] + +_tasks: + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/reco" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ gen_un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/gen" + axes: [ *centrality ] \ No newline at end of file diff --git a/src/QnAnalysisObservables/CMakeLists.txt b/src/QnAnalysisObservables/CMakeLists.txt index c7329492..c340566d 100644 --- a/src/QnAnalysisObservables/CMakeLists.txt +++ b/src/QnAnalysisObservables/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES Method.cpp MethodOf3SE.cpp V1Observables.cpp - ) + MethodOfRS.cpp) add_executable(flow Calculate.cpp ${SOURCES}) target_link_libraries(flow QnTools::Base ${ROOT_LIBRARIES}) \ No newline at end of file diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index 8c47f4de..9e1b3eda 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -6,7 +6,7 @@ #include "V1Observables.hpp" int main(){ - FileManager::OpenFile( "~/Correlations/agag123_2020_11_12.root" ); + FileManager::OpenFile( "~/Correlations/agag158_szymon.root" ); V1Observables obs_sp( V1Observables::METHODS::MethodOf3SE ); obs_sp.SetUvectors("u_RESCALED", {"x1", "y1"}); @@ -17,10 +17,6 @@ int main(){ "W3_RESCALED", "Mf_protons_RESCALED", "Mb_protons_RESCALED", - "Mf_pi_plus_RESCALED", - "Mb_pi_plus_RESCALED", - "Mf_pi_minus_RESCALED", - "Mb_pi_minus_RESCALED", }); obs_sp.SetQqCorrelationsDirectory("/QQ/SP"); obs_sp.SetUqCorrelationsDirectory("/uQ/SP"); @@ -34,18 +30,22 @@ int main(){ "W3_RESCALED", "Mf_protons_RESCALED", "Mb_protons_RESCALED", - "Mf_pi_plus_RESCALED", - "Mb_pi_plus_RESCALED", - "Mf_pi_minus_RESCALED", - "Mb_pi_minus_RESCALED", }); obs_ep.SetQqCorrelationsDirectory("/QQ/EP"); obs_ep.SetUqCorrelationsDirectory("/uQ/EP"); obs_ep.Calculate(); - auto file_out = TFile::Open("agag-123-2020-11-12.root", "recreate"); + V1Observables obs_rs( V1Observables::METHODS::MethodOfRS ); + obs_rs.SetUvectors("u_RESCALED", {"x1", "y1"}); + obs_rs.SetEPvectors({"R1_RESCALED", "R2_RESCALED"}, {"x1", "y1"}); + obs_rs.SetResolutionVectors({"R1_RESCALED", "R2_RESCALED"}); + obs_rs.SetQqCorrelationsDirectory("/QQ/SP"); + obs_rs.SetUqCorrelationsDirectory("/uQ/SP"); + obs_rs.Calculate(); + auto file_out = TFile::Open("agag-158-szymon.root", "recreate"); file_out->mkdir("SP"); file_out->cd("/SP"); obs_sp.Write(); + obs_rs.Write(); file_out->mkdir("EP"); file_out->cd("/EP"); obs_ep.Write(); diff --git a/src/QnAnalysisObservables/Method.hpp b/src/QnAnalysisObservables/Method.hpp index c67ff727..50f20621 100644 --- a/src/QnAnalysisObservables/Method.hpp +++ b/src/QnAnalysisObservables/Method.hpp @@ -28,7 +28,7 @@ class Method { void Write(){ int i=0; std::string component = u_vector_config_.component_name; - for( const auto& config : q_vectors_configs_){ + for( const auto& config : ep_vectors_configs_){ component+=config.component_name; } for( auto resolution: resolutions_){ @@ -47,7 +47,7 @@ class Method { std::vector q_vector_config, std::vector resolution_q_vectors_configs) : u_vector_config_(std::move(u_vector_config)), - q_vectors_configs_(std::move(q_vector_config)), + ep_vectors_configs_(std::move(q_vector_config)), resolution_q_vectors_configs_(std::move(resolution_q_vectors_configs)) {} static Qn::DataContainer ReadContainerFromFile( const std::string&, const std::vector& vectors ); @@ -56,7 +56,7 @@ class Method { std::string uq_directory_; std::string qq_directory_; VectorConfig u_vector_config_; - std::vector q_vectors_configs_; + std::vector ep_vectors_configs_; std::vector resolution_q_vectors_configs_; std::vector observables_names_; diff --git a/src/QnAnalysisObservables/MethodOf3SE.cpp b/src/QnAnalysisObservables/MethodOf3SE.cpp index 4188591f..2eb81db2 100644 --- a/src/QnAnalysisObservables/MethodOf3SE.cpp +++ b/src/QnAnalysisObservables/MethodOf3SE.cpp @@ -10,17 +10,17 @@ Qn::DataContainer MethodOf3SE::CalculateResolution3SE(std::ve } void MethodOf3SE::CalculateObservables(){ - auto combinations = ConstructResolution3SECombinations(q_vectors_configs_.front(), resolution_q_vectors_configs_); + auto combinations = ConstructResolution3SECombinations(ep_vectors_configs_.front(), resolution_q_vectors_configs_); std::vector> results; for( auto res_combination_names : combinations ){ std::vector> set_for_res_calc; set_for_res_calc.push_back( ReadContainerFromFile( qq_directory_, res_combination_names.at(0) ) ); set_for_res_calc.push_back( ReadContainerFromFile( qq_directory_, res_combination_names.at(1) ) ); set_for_res_calc.push_back( ReadContainerFromFile( qq_directory_, res_combination_names.at(2) ) ); - observables_names_.push_back( u_vector_config_.name+"."+q_vectors_configs_.front().name+"("+res_combination_names.at(2).front().name+","+res_combination_names.at(2).back().name+")" ); + observables_names_.push_back( u_vector_config_.name+"."+ ep_vectors_configs_.front().name+"("+res_combination_names.at(2).front().name+","+res_combination_names.at(2).back().name+")" ); resolutions_.push_back( CalculateResolution3SE( set_for_res_calc ) ); } - auto uq_correlation_confg = q_vectors_configs_; + auto uq_correlation_confg = ep_vectors_configs_; uq_correlation_confg.insert(uq_correlation_confg.begin(), u_vector_config_); auto uq_correlation = ReadContainerFromFile( uq_directory_, uq_correlation_confg ); for( const auto& res : resolutions_ ){ diff --git a/src/QnAnalysisObservables/MethodOfRS.cpp b/src/QnAnalysisObservables/MethodOfRS.cpp new file mode 100644 index 00000000..6d2fa55c --- /dev/null +++ b/src/QnAnalysisObservables/MethodOfRS.cpp @@ -0,0 +1,22 @@ +// +// Created by mikhail on 11/21/20. +// + +#include "MethodOfRS.hpp" +MethodOfRS::MethodOfRS(const VectorConfig& u_vector_config, const std::vector& q_vector_config, const std::vector& resolution_q_vectors_configs) : Method(u_vector_config, q_vector_config, resolution_q_vectors_configs) {} +MethodOfRS::~MethodOfRS() = default; +void MethodOfRS::CalculateObservables() { + if( std::size(resolution_q_vectors_configs_) != 2 ) + throw std::runtime_error( "MethodOfRS::CalculateObservables(): " + "only 2 vectors must be in set for resolution correction calculation" ); + for( auto& res_vec : resolution_q_vectors_configs_ ){ + res_vec.component_name = ep_vectors_configs_.front().component_name; + } + auto qq_container = ReadContainerFromFile(qq_directory_, resolution_q_vectors_configs_); + for( const auto& ep_vector : ep_vectors_configs_ ){ + auto uq_correlation = ReadContainerFromFile( uq_directory_, {u_vector_config_, ep_vector} ); + resolutions_.emplace_back(Sqrt( qq_container )); + observables_.emplace_back( uq_correlation*sqrt(2.0) / resolutions_.back() ); + observables_names_.emplace_back( u_vector_config_.name+"."+ ep_vector.name+"("+resolution_q_vectors_configs_.at(0).name+","+resolution_q_vectors_configs_.at(1).name+")" ); + } +} diff --git a/src/QnAnalysisObservables/MethodOfRS.hpp b/src/QnAnalysisObservables/MethodOfRS.hpp new file mode 100644 index 00000000..36d54c0e --- /dev/null +++ b/src/QnAnalysisObservables/MethodOfRS.hpp @@ -0,0 +1,17 @@ +// +// Created by mikhail on 11/21/20. +// + +#ifndef QNANALYSIS_SRC_QNANALYSISOBSERVABLES_METHOD_OF_RS_H_ +#define QNANALYSIS_SRC_QNANALYSISOBSERVABLES_METHOD_OF_RS_H_ + +#include "Method.hpp" + +class MethodOfRS : public Method { + public: + MethodOfRS(const VectorConfig& u_vector_config, const std::vector& q_vector_config, const std::vector& resolution_q_vectors_configs); + ~MethodOfRS() override; + void CalculateObservables() override; +}; + +#endif//QNANALYSIS_SRC_QNANALYSISOBSERVABLES_METHOD_OF_RS_H_ diff --git a/src/QnAnalysisObservables/V1Observables.hpp b/src/QnAnalysisObservables/V1Observables.hpp index 6645f8ae..e8c7d4d3 100644 --- a/src/QnAnalysisObservables/V1Observables.hpp +++ b/src/QnAnalysisObservables/V1Observables.hpp @@ -5,14 +5,18 @@ #ifndef OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ #define OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ -#include "Method.hpp" -#include "MethodOf3SE.hpp" #include #include + +#include "Method.hpp" +#include "MethodOf3SE.hpp" +#include "MethodOfRS.hpp" + class V1Observables { public: enum class METHODS{ - MethodOf3SE + MethodOf3SE, + MethodOfRS }; explicit V1Observables(METHODS method_type) : method_type_(method_type) {} virtual ~V1Observables() = default; @@ -41,8 +45,16 @@ class V1Observables { for( const auto& component : u_vector_components_ ) for( const auto& ep_vector : ep_vectors_names_ ) for (const auto& ep_component : ep_vectors_components_) { - methods_.emplace_back(new MethodOf3SE( - {u_vector_name_, component}, {{ep_vector, ep_component}}, resolution_qs)); + switch (method_type_) { + case METHODS::MethodOf3SE: + methods_.emplace_back(new MethodOf3SE( + {u_vector_name_, component}, {{ep_vector, ep_component}}, resolution_qs)); + break; + case METHODS::MethodOfRS: + methods_.emplace_back(new MethodOfRS( + {u_vector_name_, component}, {{ep_vector, ep_component}}, resolution_qs)); + break; + } methods_.back()->SetQqDirectory(qq_correlations_directory_); methods_.back()->SetUqDirectory(uq_correlations_directory_); } @@ -55,7 +67,7 @@ class V1Observables { } private: - std::vector methods_; + std::vector methods_; METHODS method_type_; std::string uq_correlations_directory_; std::string qq_correlations_directory_; From 35c73f6a58ac21f1b3d9cb910da17ae1e364b303 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 23 Nov 2020 18:04:19 +0300 Subject: [PATCH 018/274] Yaml configs added --- src/QnAnalysisObservables/ConvertConfigs.cpp | 3 +++ src/QnAnalysisObservables/ConvertConfigs.hpp | 8 ++++++++ 2 files changed, 11 insertions(+) create mode 100644 src/QnAnalysisObservables/ConvertConfigs.cpp create mode 100644 src/QnAnalysisObservables/ConvertConfigs.hpp diff --git a/src/QnAnalysisObservables/ConvertConfigs.cpp b/src/QnAnalysisObservables/ConvertConfigs.cpp new file mode 100644 index 00000000..8406861d --- /dev/null +++ b/src/QnAnalysisObservables/ConvertConfigs.cpp @@ -0,0 +1,3 @@ +// +// Created by mikhail on 11/23/20. +// diff --git a/src/QnAnalysisObservables/ConvertConfigs.hpp b/src/QnAnalysisObservables/ConvertConfigs.hpp new file mode 100644 index 00000000..3f71f15b --- /dev/null +++ b/src/QnAnalysisObservables/ConvertConfigs.hpp @@ -0,0 +1,8 @@ +// +// Created by mikhail on 11/23/20. +// + +#ifndef QNANALYSIS_SRC_QNANALYSISOBSERVABLES_CONVERTCONFIGS_H_ +#define QNANALYSIS_SRC_QNANALYSISOBSERVABLES_CONVERTCONFIGS_H_ + +#endif//QNANALYSIS_SRC_QNANALYSISOBSERVABLES_CONVERTCONFIGS_H_ From 9169cf57a8a582f79053f33f55123cdca4dec83a Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 23 Nov 2020 18:06:51 +0300 Subject: [PATCH 019/274] Yaml configs added --- setups/observables-calculation-config.yml | 30 ++-- src/QnAnalysisObservables/CMakeLists.txt | 7 +- src/QnAnalysisObservables/Calculate.cpp | 136 +++++++++++++------ src/QnAnalysisObservables/ConvertConfigs.cpp | 2 + src/QnAnalysisObservables/ConvertConfigs.hpp | 36 +++++ src/QnAnalysisObservables/Method.cpp | 8 +- src/QnAnalysisObservables/Method.hpp | 18 +-- src/QnAnalysisObservables/MethodOf3SE.cpp | 8 +- src/QnAnalysisObservables/MethodOf3SE.hpp | 8 +- src/QnAnalysisObservables/MethodOfRS.cpp | 2 +- src/QnAnalysisObservables/MethodOfRS.hpp | 2 +- src/QnAnalysisObservables/V1Observables.hpp | 30 +++- 12 files changed, 202 insertions(+), 85 deletions(-) diff --git a/setups/observables-calculation-config.yml b/setups/observables-calculation-config.yml index adf54372..bd2086c9 100644 --- a/setups/observables-calculation-config.yml +++ b/setups/observables-calculation-config.yml @@ -1,20 +1,22 @@ _detectors: &detectors - - name: detectorI - components: [cos1,sin1] - tags: [group-A] - correction-step: rescaled - - name: detectorII + - name: W1 + correction-step: RESCALED components: [x1,y1] - tags: [group-B] - correction-step: recentered - - name: detectorIII + tag: group-A + - name: W2 + correction-step: RESCALED components: [x1,y1] - tags: [group-B] - correction-step: plain + tag: group-A + - name: W3 + correction-step: RESCALED + components: [x1,y1] + tag: group-A _observables: - - observable-for-v1: - u-vector: {name: u, components: [x1, y1], correction-step: rescaled} - EP-vectors: { tags: { any-in: [ group-A ] } } - Q-vectors: { tags: { any-in: [ group-B ] } } + - method: three-sub-event + QQ-directory: QQ/SP + uQ-directory: uQ/SP + u-vector: {name: u, components: [x1, y1], correction-step: RESCALED} + EP-vectors: group-A + resolution-vectors: group-A folder: "A" \ No newline at end of file diff --git a/src/QnAnalysisObservables/CMakeLists.txt b/src/QnAnalysisObservables/CMakeLists.txt index c340566d..1ae24aef 100644 --- a/src/QnAnalysisObservables/CMakeLists.txt +++ b/src/QnAnalysisObservables/CMakeLists.txt @@ -1,9 +1,12 @@ +find_package(Boost REQUIRED COMPONENTS program_options) + set(SOURCES FileManager.cpp Method.cpp MethodOf3SE.cpp V1Observables.cpp - MethodOfRS.cpp) + MethodOfRS.cpp + ConvertConfigs.cpp) add_executable(flow Calculate.cpp ${SOURCES}) -target_link_libraries(flow QnTools::Base ${ROOT_LIBRARIES}) \ No newline at end of file +target_link_libraries(flow QnTools::Base Boost::program_options ${ROOT_LIBRARIES} yaml-cpp) \ No newline at end of file diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index 9e1b3eda..ca321c15 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -2,54 +2,102 @@ // Created by mikhail on 10/23/20. // +#include "ConvertConfigs.hpp" #include "FileManager.hpp" #include "V1Observables.hpp" +#include +#include -int main(){ - FileManager::OpenFile( "~/Correlations/agag158_szymon.root" ); +int main(int argv, char** argc){ + namespace po = boost::program_options; + std::string input_file; + std::string output_file_name{"output.root"}; + std::string config_file; + po::options_description options("Options"); + options.add_options() + ("help,h", "Help screen") + ("MC,m", "MC data sample") + ("input,i", po::value(&input_file), "Input file list") + ("output,o", po::value(&output_file_name), "Name of output file") + ("config,c", po::value(&config_file),"path to yaml-config file"); + po::variables_map vm; + po::parsed_options parsed = po::command_line_parser(argv, argc).options(options).run(); + po::store(parsed, vm); + po::notify(vm); + if (vm.count("help")){ + std::cout << options << std::endl; + return 0; + } + FileManager::OpenFile( input_file ); + auto config = YAML::LoadFile( config_file ); + auto detectors_configs = config["_detectors"].as>(); + auto observables_configs = config["_observables"].as>(); + std::vector observables; + observables.reserve(observables_configs.size()); - V1Observables obs_sp( V1Observables::METHODS::MethodOf3SE ); - obs_sp.SetUvectors("u_RESCALED", {"x1", "y1"}); - obs_sp.SetEPvectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED"}, {"x1", "y1"}); - obs_sp.SetResolutionVectors({ - "W1_RESCALED", - "W2_RESCALED", - "W3_RESCALED", - "Mf_protons_RESCALED", - "Mb_protons_RESCALED", - }); - obs_sp.SetQqCorrelationsDirectory("/QQ/SP"); - obs_sp.SetUqCorrelationsDirectory("/uQ/SP"); - obs_sp.Calculate(); - V1Observables obs_ep( V1Observables::METHODS::MethodOf3SE ); - obs_ep.SetUvectors("u_RESCALED", {"x1", "y1"}); - obs_ep.SetEPvectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED"}, {"cos1", "sin1"}); - obs_ep.SetResolutionVectors({ - "W1_RESCALED", - "W2_RESCALED", - "W3_RESCALED", - "Mf_protons_RESCALED", - "Mb_protons_RESCALED", - }); - obs_ep.SetQqCorrelationsDirectory("/QQ/EP"); - obs_ep.SetUqCorrelationsDirectory("/uQ/EP"); - obs_ep.Calculate(); - V1Observables obs_rs( V1Observables::METHODS::MethodOfRS ); - obs_rs.SetUvectors("u_RESCALED", {"x1", "y1"}); - obs_rs.SetEPvectors({"R1_RESCALED", "R2_RESCALED"}, {"x1", "y1"}); - obs_rs.SetResolutionVectors({"R1_RESCALED", "R2_RESCALED"}); - obs_rs.SetQqCorrelationsDirectory("/QQ/SP"); - obs_rs.SetUqCorrelationsDirectory("/uQ/SP"); - obs_rs.Calculate(); - auto file_out = TFile::Open("agag-158-szymon.root", "recreate"); - file_out->mkdir("SP"); - file_out->cd("/SP"); - obs_sp.Write(); - obs_rs.Write(); - file_out->mkdir("EP"); - file_out->cd("/EP"); - obs_ep.Write(); - file_out->Close(); + auto out_file = TFile::Open(output_file_name.c_str(), "recreate" ); + for( const auto &observable_config : observables_configs ){ + observables.emplace_back( observable_config.method ); + observables.back().SetQqCorrelationsDirectory(observable_config.qq_correlations_directory); + observables.back().SetUqCorrelationsDirectory(observable_config.uq_correlations_directory); + observables.back().SetUvector( observable_config.u_vector ); + std::vector ep_vectors; + for( const auto& vector : detectors_configs ) + if( vector.tag == observable_config.ep_vectors_tag ) + ep_vectors.emplace_back(vector); + observables.back().SetEPvectors(ep_vectors); + std::vector resolution_vectors; + for( const auto& vector : detectors_configs ) + if( vector.tag == observable_config.resolution_vectors_tag ) + resolution_vectors.emplace_back(vector.name+"_"+vector.correction_step); + observables.back().SetResolutionVectors(resolution_vectors); + observables.back().Calculate(); + out_file->cd(); + observables.back().Write(); + } + out_file->Close(); +// V1Observables obs_sp( V1Observables::METHODS::MethodOf3SE ); +// obs_sp.SetUvector("u_RESCALED", {"x1", "y1"}); +// obs_sp.SetEPvectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED"}, {"x1", "y1"}); +// obs_sp.SetResolutionVectors({ +// "W1_RESCALED", +// "W2_RESCALED", +// "W3_RESCALED", +// "Mf_protons_RESCALED", +// "Mb_protons_RESCALED", +// }); +// obs_sp.SetQqCorrelationsDirectory("/QQ/SP"); +// obs_sp.SetUqCorrelationsDirectory("/uQ/SP"); +// obs_sp.Calculate(); +// V1Observables obs_ep( V1Observables::METHODS::MethodOf3SE ); +// obs_ep.SetUvector("u_RESCALED", {"x1", "y1"}); +// obs_ep.SetEPvectors({"W1_RESCALED", "W2_RESCALED", "W3_RESCALED"}, {"cos1", "sin1"}); +// obs_ep.SetResolutionVectors({ +// "W1_RESCALED", +// "W2_RESCALED", +// "W3_RESCALED", +// "Mf_protons_RESCALED", +// "Mb_protons_RESCALED", +// }); +// obs_ep.SetQqCorrelationsDirectory("/QQ/EP"); +// obs_ep.SetUqCorrelationsDirectory("/uQ/EP"); +// obs_ep.Calculate(); +// V1Observables obs_rs( V1Observables::METHODS::MethodOfRS ); +// obs_rs.SetUvector("u_RESCALED", {"x1", "y1"}); +// obs_rs.SetEPvectors({"R1_RESCALED", "R2_RESCALED"}, {"x1", "y1"}); +// obs_rs.SetResolutionVectors({"R1_RESCALED", "R2_RESCALED"}); +// obs_rs.SetQqCorrelationsDirectory("/QQ/SP"); +// obs_rs.SetUqCorrelationsDirectory("/uQ/SP"); +//// obs_rs.Calculate(); +// auto file_out = TFile::Open("agag-158-szymon.root", "recreate"); +// file_out->mkdir("SP"); +// file_out->cd("/SP"); +// obs_sp.Write(); +// obs_rs.Write(); +// file_out->mkdir("EP"); +// file_out->cd("/EP"); +// obs_ep.Write(); +// file_out->Close(); return 0; } \ No newline at end of file diff --git a/src/QnAnalysisObservables/ConvertConfigs.cpp b/src/QnAnalysisObservables/ConvertConfigs.cpp index 8406861d..c83c45e1 100644 --- a/src/QnAnalysisObservables/ConvertConfigs.cpp +++ b/src/QnAnalysisObservables/ConvertConfigs.cpp @@ -1,3 +1,5 @@ // // Created by mikhail on 11/23/20. // + +#include "ConvertConfigs.hpp" \ No newline at end of file diff --git a/src/QnAnalysisObservables/ConvertConfigs.hpp b/src/QnAnalysisObservables/ConvertConfigs.hpp index 3f71f15b..105c395d 100644 --- a/src/QnAnalysisObservables/ConvertConfigs.hpp +++ b/src/QnAnalysisObservables/ConvertConfigs.hpp @@ -5,4 +5,40 @@ #ifndef QNANALYSIS_SRC_QNANALYSISOBSERVABLES_CONVERTCONFIGS_H_ #define QNANALYSIS_SRC_QNANALYSISOBSERVABLES_CONVERTCONFIGS_H_ +#include "V1Observables.hpp" +#include +namespace YAML { +template<> +struct convert { + static bool decode(const Node& node, VectorConfig& vector_config) { + if( !node.IsMap() ) { + return false; + } + vector_config.name = node["name"].as(); + vector_config.components = node["components"].as>(); + vector_config.correction_step = node["correction-step"].as(); +// try + vector_config.tag = node["tag"].as(""); + return true; + } +}; + +template<> +struct convert { + static bool decode(const Node& node, VnObservablesConfig& vn_observables_config) { + auto method_type = node["method"].as(); + if( method_type == "three-sub-event" ) + vn_observables_config.method = V1Observables::METHODS::MethodOf3SE; + else if( method_type == "rnd-sub-event" ) + vn_observables_config.method = V1Observables::METHODS::MethodOfRS; + else return false; + vn_observables_config.qq_correlations_directory = node["QQ-directory"].as(); + vn_observables_config.uq_correlations_directory = node["uQ-directory"].as(); + vn_observables_config.u_vector = node["u-vector"].as(); + vn_observables_config.ep_vectors_tag = node["EP-vectors"].as(); + vn_observables_config.resolution_vectors_tag = node["resolution-vectors"].as(); + return true; + } +}; +}// namespace YAML #endif//QNANALYSIS_SRC_QNANALYSISOBSERVABLES_CONVERTCONFIGS_H_ diff --git a/src/QnAnalysisObservables/Method.cpp b/src/QnAnalysisObservables/Method.cpp index 47e9970d..2ac0358d 100644 --- a/src/QnAnalysisObservables/Method.cpp +++ b/src/QnAnalysisObservables/Method.cpp @@ -4,7 +4,7 @@ #include "Method.hpp" -Qn::DataContainer Method::ReadContainerFromFile( const std::string& directory, const std::vector& vectors ){ +Qn::DataContainer Method::ReadContainerFromFile( const std::string& directory, const std::vector& vectors ){ Qn::DataContainerStatCollect* obj; std::string name; std::string component; @@ -43,14 +43,14 @@ Qn::DataContainer Method::ReadContainerFromFile( const std::s throw std::runtime_error( "Method::ReadContainerFromFile: No such a correlation in file "+name ); } -std::vector> Method::GetAllCombinations( std::vector elements ){ - std::vector> result; +std::vector> Method::GetAllCombinations( std::vector elements ){ + std::vector> result; if( elements.size() == 1 ){ result = {elements}; return result; } auto el1 = elements.front(); - std::vector> prev_combinations; + std::vector> prev_combinations; elements.erase(elements.begin()); prev_combinations=GetAllCombinations(elements); for( size_t i=0; i q_vector_config, - std::vector resolution_q_vectors_configs) + Method(VectorComponentConfig u_vector_config, + std::vector q_vector_config, + std::vector resolution_q_vectors_configs) : u_vector_config_(std::move(u_vector_config)), ep_vectors_configs_(std::move(q_vector_config)), resolution_q_vectors_configs_(std::move(resolution_q_vectors_configs)) {} - static Qn::DataContainer ReadContainerFromFile( const std::string&, const std::vector& vectors ); - static std::vector> GetAllCombinations( std::vector elements ); + static Qn::DataContainer ReadContainerFromFile( const std::string&, const std::vector& vectors ); + static std::vector> GetAllCombinations( std::vector elements ); std::string uq_directory_; std::string qq_directory_; - VectorConfig u_vector_config_; - std::vector ep_vectors_configs_; - std::vector resolution_q_vectors_configs_; + VectorComponentConfig u_vector_config_; + std::vector ep_vectors_configs_; + std::vector resolution_q_vectors_configs_; std::vector observables_names_; diff --git a/src/QnAnalysisObservables/MethodOf3SE.cpp b/src/QnAnalysisObservables/MethodOf3SE.cpp index 2eb81db2..69818db5 100644 --- a/src/QnAnalysisObservables/MethodOf3SE.cpp +++ b/src/QnAnalysisObservables/MethodOf3SE.cpp @@ -28,10 +28,10 @@ void MethodOf3SE::CalculateObservables(){ } } -std::vector>> MethodOf3SE::ConstructResolution3SECombinations( - VectorConfig reff_q, std::vector q_combination){ +std::vector>> MethodOf3SE::ConstructResolution3SECombinations( + VectorComponentConfig reff_q, std::vector q_combination){ auto q1 = std::move(reff_q); - std::vector>> combinations; + std::vector>> combinations; for (size_t i=0; i>> MethodOf3SE::ConstructResolu if( q1.name == q3.name ) continue; q3.component_name = q1.component_name; - std::vector> combination; + std::vector> combination; combination.push_back({q1, q2}); combination.push_back({q1, q3}); combination.push_back({q2, q3}); diff --git a/src/QnAnalysisObservables/MethodOf3SE.hpp b/src/QnAnalysisObservables/MethodOf3SE.hpp index ca41583c..273a6de5 100644 --- a/src/QnAnalysisObservables/MethodOf3SE.hpp +++ b/src/QnAnalysisObservables/MethodOf3SE.hpp @@ -15,16 +15,16 @@ class MethodOf3SE : public Method { public: - MethodOf3SE(const VectorConfig &u_vector_config, - const std::vector &q_vector_config, - const std::vector &resolution_q_vectors_configs) + MethodOf3SE(const VectorComponentConfig&u_vector_config, + const std::vector &q_vector_config, + const std::vector &resolution_q_vectors_configs) : Method(u_vector_config, q_vector_config, resolution_q_vectors_configs) {} ~MethodOf3SE() override = default; void CalculateObservables() override; protected: static Qn::DataContainer CalculateResolution3SE(std::vector correlations); - static std::vector>> ConstructResolution3SECombinations(VectorConfig reff_q, std::vector q_combination); + static std::vector>> ConstructResolution3SECombinations(VectorComponentConfig reff_q, std::vector q_combination); }; #endif // OBSERVABLESCALCULATOR_SRC_METHOD_OF_3SE_H_ diff --git a/src/QnAnalysisObservables/MethodOfRS.cpp b/src/QnAnalysisObservables/MethodOfRS.cpp index 6d2fa55c..6da9fcbd 100644 --- a/src/QnAnalysisObservables/MethodOfRS.cpp +++ b/src/QnAnalysisObservables/MethodOfRS.cpp @@ -3,7 +3,7 @@ // #include "MethodOfRS.hpp" -MethodOfRS::MethodOfRS(const VectorConfig& u_vector_config, const std::vector& q_vector_config, const std::vector& resolution_q_vectors_configs) : Method(u_vector_config, q_vector_config, resolution_q_vectors_configs) {} +MethodOfRS::MethodOfRS(const VectorComponentConfig& u_vector_config, const std::vector& q_vector_config, const std::vector& resolution_q_vectors_configs) : Method(u_vector_config, q_vector_config, resolution_q_vectors_configs) {} MethodOfRS::~MethodOfRS() = default; void MethodOfRS::CalculateObservables() { if( std::size(resolution_q_vectors_configs_) != 2 ) diff --git a/src/QnAnalysisObservables/MethodOfRS.hpp b/src/QnAnalysisObservables/MethodOfRS.hpp index 36d54c0e..809b7939 100644 --- a/src/QnAnalysisObservables/MethodOfRS.hpp +++ b/src/QnAnalysisObservables/MethodOfRS.hpp @@ -9,7 +9,7 @@ class MethodOfRS : public Method { public: - MethodOfRS(const VectorConfig& u_vector_config, const std::vector& q_vector_config, const std::vector& resolution_q_vectors_configs); + MethodOfRS(const VectorComponentConfig& u_vector_config, const std::vector& q_vector_config, const std::vector& resolution_q_vectors_configs); ~MethodOfRS() override; void CalculateObservables() override; }; diff --git a/src/QnAnalysisObservables/V1Observables.hpp b/src/QnAnalysisObservables/V1Observables.hpp index e8c7d4d3..990483a0 100644 --- a/src/QnAnalysisObservables/V1Observables.hpp +++ b/src/QnAnalysisObservables/V1Observables.hpp @@ -12,6 +12,13 @@ #include "MethodOf3SE.hpp" #include "MethodOfRS.hpp" +struct VectorConfig{ + std::string name; + std::string correction_step; + std::vector components; + std::string tag; +}; + class V1Observables { public: enum class METHODS{ @@ -20,14 +27,24 @@ class V1Observables { }; explicit V1Observables(METHODS method_type) : method_type_(method_type) {} virtual ~V1Observables() = default; - void SetUvectors( std::string name, std::vector components ){ + void SetUvector( std::string name, std::vector components ){ u_vector_name_ = std::move(name); u_vector_components_ = std::move(components); } + void SetUvector( const VectorConfig& u_vector ){ + u_vector_name_ = u_vector.name+"_"+u_vector.correction_step; + u_vector_components_ = u_vector.components; + }; void SetEPvectors( std::vector names, std::vector components ){ ep_vectors_names_ = std::move(names); ep_vectors_components_ = std::move(components); } + void SetEPvectors( const std::vector& vectors){ + for( const auto& vector : vectors ) { + ep_vectors_names_.emplace_back(vector.name + "_" + vector.correction_step); + } + ep_vectors_components_ = vectors.front().components; + } void SetResolutionVectors( std::vector names){ resolution_q_vectors_ = std::move(names); } @@ -38,7 +55,7 @@ class V1Observables { qq_correlations_directory_ = qq_correlations_directory; } void Calculate(){ - std::vector resolution_qs; + std::vector resolution_qs; for( const auto& name : resolution_q_vectors_ ){ resolution_qs.push_back({name}); } @@ -78,4 +95,13 @@ class V1Observables { std::vector resolution_q_vectors_; }; +struct VnObservablesConfig { + V1Observables::METHODS method; + std::string uq_correlations_directory; + std::string qq_correlations_directory; + VectorConfig u_vector; + std::string ep_vectors_tag; + std::string resolution_vectors_tag; +}; + #endif // OBSERVABLESCALCULATOR_SRC_CALCULATOR_H_ From 990b4a0b46d56767f5f1abdff6f1654ae0a20b05 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 24 Nov 2020 14:56:47 +0300 Subject: [PATCH 020/274] Yaml config works --- setups/hades/correction-auau-123.yml | 78 +++++++------------- setups/hades/correlation.yml | 8 -- setups/hades/mc-correction-auau-123.yml | 4 +- setups/hades/mc-correlation.yml | 52 ++++++------- src/QnAnalysisObservables/ConvertConfigs.hpp | 1 - 5 files changed, 54 insertions(+), 89 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index f360da13..c71d1a84 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -26,6 +26,14 @@ _cuts: - &mb_cuts mdc_vtx_tracks/pT: {range: [0.0, 2.0]} mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} + - &r1_cuts + forward_wall_hits/rnd_sub: { equals: 0 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &r2_cuts + forward_wall_hits/rnd_sub: { equals: 1 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } - &w1_cuts forward_wall_hits/ring: { range: [1.0, 5.0] } forward_wall_hits/beta: { range: [0.84, 1.0] } @@ -45,6 +53,7 @@ hades_analysis: axes: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: + ############################################################# - name: u type: track phi: mdc_vtx_tracks/phi @@ -64,6 +73,7 @@ hades_analysis: - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] + ############################################################# - name: Mf_protons type: track phi: mdc_vtx_tracks/phi @@ -79,6 +89,7 @@ hades_analysis: *protons_cuts qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# - name: Mb_protons type: track phi: mdc_vtx_tracks/phi @@ -94,66 +105,27 @@ hades_analysis: *protons_cuts qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mf_pi_plus - type: track - phi: mdc_vtx_tracks/phi - weight: Ones - corrections: - - recentering - - twist-and-rescale - cuts-subevent: - *mf_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_plus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mb_pi_plus - type: track - phi: mdc_vtx_tracks/phi - weight: Ones - corrections: - - recentering - - twist-and-rescale - cuts-subevent: - *mb_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_plus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mf_pi_minus + ############################################################# + - name: R1 type: track - phi: mdc_vtx_tracks/phi - weight: Ones + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal corrections: - recentering - twist-and-rescale - cuts-subevent: - *mf_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_minus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mb_pi_minus + cuts: + *r1_cuts + ############################################################# + - name: R2 type: track - phi: mdc_vtx_tracks/phi - weight: Ones + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal corrections: - recentering - twist-and-rescale - cuts-subevent: - *mb_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_minus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + cuts: + *r2_cuts + ############################################################# - name: W1 type: track phi: forward_wall_hits/phi @@ -163,6 +135,7 @@ hades_analysis: - twist-and-rescale cuts: *w1_cuts + ############################################################# - name: W2 type: track phi: forward_wall_hits/phi @@ -172,6 +145,7 @@ hades_analysis: - twist-and-rescale cuts: *w2_cuts + ############################################################# - name: W3 type: track phi: forward_wall_hits/phi diff --git a/setups/hades/correlation.yml b/setups/hades/correlation.yml index 43ee1f77..2172a896 100644 --- a/setups/hades/correlation.yml +++ b/setups/hades/correlation.yml @@ -1,28 +1,20 @@ _detectors: &detectors - name: u tags: [ un_vector ] - correction-step: rescaled - name: W1 tags: [ qn_vector ] - correction-step: rescaled - name: W2 tags: [ qn_vector ] - correction-step: rescaled - name: W3 tags: [ qn_vector ] - correction-step: rescaled - name: R1 tags: [ rnd_vector ] - correction-step: rescaled - name: R2 tags: [ rnd_vector ] - correction-step: rescaled - name: Mf_protons tags: [ qn_vector ] - correction-step: rescaled - name: Mb_protons tags: [ qn_vector ] - correction-step: rescaled _axes: - ¢rality diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 3ce7f592..5a8cfe44 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -69,9 +69,9 @@ hades_analysis: - *axis_gen_rapidity - [*axis_gen_rapidity, *axis_gen_pT] ########################################################################### - - name: psi + - name: psi_rp type: psi phi: sim_header/reaction_plane -# weight: Ones + weight: Ones # qa: # - {name: sim_header/reaction_plane, nb: 320, lo: -3.2, hi: 3.2} \ No newline at end of file diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index e9f8256a..c4fa2e36 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -5,8 +5,8 @@ _detectors: &detectors - name: gen_prim tags: [ gen_un_vector ] correction-step: plain - - name: psi - tags: [ qn_vector ] + - name: psi_rp + tags: [ psi_vector ] correction-step: plain _axes: @@ -22,34 +22,34 @@ _components: - &ep_components [ cos1,sin1 ] +_tasks_args: + - &ta_reco + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_sim + query: { tags: { any-in: [ gen_un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ plain ] + weight: ones + _tasks: - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ plain ] - weight: sumw - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ plain ] - weight: ones - n-samples: 100 + - args: [*ta_reco, *ta_psi] + n-samples: 50 weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ gen_un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ plain ] - weight: sumw - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ plain ] - weight: ones - n-samples: 100 + - args: [*ta_sim, *ta_psi] + n-samples: 50 weights-type: observable folder: "/uQ/gen" axes: [ *centrality ] \ No newline at end of file diff --git a/src/QnAnalysisObservables/ConvertConfigs.hpp b/src/QnAnalysisObservables/ConvertConfigs.hpp index 105c395d..859dbfc2 100644 --- a/src/QnAnalysisObservables/ConvertConfigs.hpp +++ b/src/QnAnalysisObservables/ConvertConfigs.hpp @@ -17,7 +17,6 @@ struct convert { vector_config.name = node["name"].as(); vector_config.components = node["components"].as>(); vector_config.correction_step = node["correction-step"].as(); -// try vector_config.tag = node["tag"].as(""); return true; } From 72764b3bd49763afaa2f90cb6414a6f8cdf6ee90 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 24 Nov 2020 17:16:50 +0300 Subject: [PATCH 021/274] multiple tags in yaml config of observables calculator --- setups/hades/correction-agag-158.yml | 8 ++++++++ setups/hades/mc-correction-auau-123.yml | 1 + setups/observables-calculation-config.yml | 19 +++++++++++++------ src/QnAnalysisObservables/Calculate.cpp | 4 ++-- src/QnAnalysisObservables/ConvertConfigs.hpp | 4 +++- src/QnAnalysisObservables/V1Observables.hpp | 2 +- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index a0b5ca91..5c10b718 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -57,6 +57,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks/phi weight: Ones + norm: none corrections: - recentering - twist-and-rescale @@ -76,6 +77,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -91,6 +93,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -106,6 +109,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -115,6 +119,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -124,6 +129,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -133,6 +139,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -142,6 +149,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 5a8cfe44..754f2fa7 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -73,5 +73,6 @@ hades_analysis: type: psi phi: sim_header/reaction_plane weight: Ones + norm: mag # qa: # - {name: sim_header/reaction_plane, nb: 320, lo: -3.2, hi: 3.2} \ No newline at end of file diff --git a/setups/observables-calculation-config.yml b/setups/observables-calculation-config.yml index bd2086c9..06eab338 100644 --- a/setups/observables-calculation-config.yml +++ b/setups/observables-calculation-config.yml @@ -2,21 +2,28 @@ _detectors: &detectors - name: W1 correction-step: RESCALED components: [x1,y1] - tag: group-A + tags: [ep-vectors, res-vectors] - name: W2 correction-step: RESCALED components: [x1,y1] - tag: group-A + tags: [ep-vectors, res-vectors] - name: W3 correction-step: RESCALED components: [x1,y1] - tag: group-A + tags: [ep-vectors, res-vectors] + - name: Mf_protons + correction-step: RESCALED + components: [x1,y1] + tags: [res-vectors] + - name: Mb_protons + correction-step: RESCALED + components: [x1,y1] + tags: [res-vectors] _observables: - method: three-sub-event QQ-directory: QQ/SP uQ-directory: uQ/SP u-vector: {name: u, components: [x1, y1], correction-step: RESCALED} - EP-vectors: group-A - resolution-vectors: group-A - folder: "A" \ No newline at end of file + EP-vectors: ep-vectors + resolution-vectors: res-vectors \ No newline at end of file diff --git a/src/QnAnalysisObservables/Calculate.cpp b/src/QnAnalysisObservables/Calculate.cpp index ca321c15..56b13c09 100644 --- a/src/QnAnalysisObservables/Calculate.cpp +++ b/src/QnAnalysisObservables/Calculate.cpp @@ -43,12 +43,12 @@ int main(int argv, char** argc){ observables.back().SetUvector( observable_config.u_vector ); std::vector ep_vectors; for( const auto& vector : detectors_configs ) - if( vector.tag == observable_config.ep_vectors_tag ) + if( std::count(vector.tags.begin(), vector.tags.end(), observable_config.ep_vectors_tag) > 0 ) ep_vectors.emplace_back(vector); observables.back().SetEPvectors(ep_vectors); std::vector resolution_vectors; for( const auto& vector : detectors_configs ) - if( vector.tag == observable_config.resolution_vectors_tag ) + if( std::count(vector.tags.begin(), vector.tags.end(), observable_config.resolution_vectors_tag) > 0 ) resolution_vectors.emplace_back(vector.name+"_"+vector.correction_step); observables.back().SetResolutionVectors(resolution_vectors); observables.back().Calculate(); diff --git a/src/QnAnalysisObservables/ConvertConfigs.hpp b/src/QnAnalysisObservables/ConvertConfigs.hpp index 859dbfc2..3564a9b8 100644 --- a/src/QnAnalysisObservables/ConvertConfigs.hpp +++ b/src/QnAnalysisObservables/ConvertConfigs.hpp @@ -17,7 +17,9 @@ struct convert { vector_config.name = node["name"].as(); vector_config.components = node["components"].as>(); vector_config.correction_step = node["correction-step"].as(); - vector_config.tag = node["tag"].as(""); + try { + vector_config.tags = node["tags"].as>(); + } catch (std::exception&) {} return true; } }; diff --git a/src/QnAnalysisObservables/V1Observables.hpp b/src/QnAnalysisObservables/V1Observables.hpp index 990483a0..becfa00e 100644 --- a/src/QnAnalysisObservables/V1Observables.hpp +++ b/src/QnAnalysisObservables/V1Observables.hpp @@ -16,7 +16,7 @@ struct VectorConfig{ std::string name; std::string correction_step; std::vector components; - std::string tag; + std::vector tags; }; class V1Observables { From 625327f4631c8c7fb206621d637fca92f600a19e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 24 Nov 2020 17:18:21 +0300 Subject: [PATCH 022/274] Name of executable changed --- src/QnAnalysisObservables/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/QnAnalysisObservables/CMakeLists.txt b/src/QnAnalysisObservables/CMakeLists.txt index 1ae24aef..7f36b032 100644 --- a/src/QnAnalysisObservables/CMakeLists.txt +++ b/src/QnAnalysisObservables/CMakeLists.txt @@ -8,5 +8,5 @@ set(SOURCES MethodOfRS.cpp ConvertConfigs.cpp) -add_executable(flow Calculate.cpp ${SOURCES}) -target_link_libraries(flow QnTools::Base Boost::program_options ${ROOT_LIBRARIES} yaml-cpp) \ No newline at end of file +add_executable(BuildObservables Calculate.cpp ${SOURCES}) +target_link_libraries(BuildObservables QnTools::Base Boost::program_options ${ROOT_LIBRARIES} yaml-cpp) \ No newline at end of file From 40596204b28acf42272a409146a182c3a9524ffe Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 30 Nov 2020 19:31:39 +0300 Subject: [PATCH 023/274] mc-all correlations setup added --- setups/hades/mc-correction-auau-123-all.yml | 40 ++++++++++++++++++++ setups/hades/mc-correlation-all.yml | 41 +++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 setups/hades/mc-correction-auau-123-all.yml create mode 100644 setups/hades/mc-correlation-all.yml diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml new file mode 100644 index 00000000..60b40a98 --- /dev/null +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -0,0 +1,40 @@ +_layouts: + +_axes: + - &axis_gen_pT + name: sim_tracks_rapidity/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_gen_rapidity + name: sim_tracks_rapidity/rapidity + nb: 15 + lo: -0.01 + hi: 1.49 + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: +########################################################################### + - name: gen_all + type: track + phi: sim_tracks_rapidity/phi + weight: Ones + axes: + - *axis_gen_pT + - *axis_gen_rapidity + qa: + - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_pT + - *axis_gen_rapidity + - [*axis_gen_rapidity, *axis_gen_pT] + norm: m +########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag +# qa: +# - {name: sim_header/reaction_plane, nb: 320, lo: -3.2, hi: 3.2} \ No newline at end of file diff --git a/setups/hades/mc-correlation-all.yml b/setups/hades/mc-correlation-all.yml new file mode 100644 index 00000000..88e1795d --- /dev/null +++ b/setups/hades/mc-correlation-all.yml @@ -0,0 +1,41 @@ +_detectors: &detectors + - name: gen_all + tags: [ gen_un_vector ] + correction-step: plain + - name: psi_rp + tags: [ psi_vector ] + correction-step: plain + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + - &ep_components + [ cos1,sin1 ] + +_tasks_args: + - &ta_all + query: { tags: { any-in: [ gen_un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_all, *ta_psi] + n-samples: 50 + weights-type: observable + folder: "/uQ/reco" + axes: [ *centrality ] \ No newline at end of file From 360cd22cd6ebb27eee49e7c3d5caf3df15bf2412 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 1 Dec 2020 21:54:14 +0300 Subject: [PATCH 024/274] setup for all particles flow --- setups/hades/correction-auau-123-all.yml | 149 +++++++++++++++++++++++ setups/hades/correlation-all.yml | 145 ++++++++++++++++++++++ 2 files changed, 294 insertions(+) create mode 100644 setups/hades/correction-auau-123-all.yml create mode 100644 setups/hades/correlation-all.yml diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml new file mode 100644 index 00000000..fee031fa --- /dev/null +++ b/setups/hades/correction-auau-123-all.yml @@ -0,0 +1,149 @@ +_layouts: + +_axes: + - &axis_pT + name: mdc_vtx_tracks_rapidity/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_rapidity + name: mdc_vtx_tracks_rapidity/rapidity + nb: 15 + lo: -0.01 + hi: 1.49 +_cuts: + - &protons_cuts + mdc_vtx_tracks/pid: { equals: 2212 } + - &good_particle_cuts + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + - &mf_cuts + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [1.09, 1.29]} + - &mb_cuts + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} + - &r1_cuts + forward_wall_hits/rnd_sub: { equals: 0 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &r2_cuts + forward_wall_hits/rnd_sub: { equals: 1 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/beta: { range: [0.84, 1.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/beta: { range: [0.85, 1.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/beta: { range: [0.80, 1.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: + ############################################################# + - name: u + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT + - *axis_rapidity + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT + - *axis_rapidity + - [*axis_rapidity, *axis_pT] + ############################################################# + - name: Mf_protons + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mf_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *protons_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: Mb_protons + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mb_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *protons_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: R1 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *r1_cuts + ############################################################# + - name: R2 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *r2_cuts + ############################################################# + - name: W1 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w1_cuts + ############################################################# + - name: W2 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w2_cuts + ############################################################# + - name: W3 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + corrections: + - recentering + - twist-and-rescale + cuts: + *w3_cuts \ No newline at end of file diff --git a/setups/hades/correlation-all.yml b/setups/hades/correlation-all.yml new file mode 100644 index 00000000..2172a896 --- /dev/null +++ b/setups/hades/correlation-all.yml @@ -0,0 +1,145 @@ +_detectors: &detectors + - name: u + tags: [ un_vector ] + - name: W1 + tags: [ qn_vector ] + - name: W2 + tags: [ qn_vector ] + - name: W3 + tags: [ qn_vector ] + - name: R1 + tags: [ rnd_vector ] + - name: R2 + tags: [ rnd_vector ] + - name: Mf_protons + tags: [ qn_vector ] + - name: Mb_protons + tags: [ qn_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + - &ep_components + [ cos1,sin1 ] + +_tasks: + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components # + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/EP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components # + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/EP" + axes: [ *centrality ] + # Reference x Reference + - args: + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/EP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/EP" + axes: [ *centrality ] \ No newline at end of file From 8e8183b932dbdbedb65106e85546ce8de22be533 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 1 Dec 2020 22:01:04 +0300 Subject: [PATCH 025/274] normalization added --- setups/hades/correction-auau-123-all.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index fee031fa..29cf48a5 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -54,6 +54,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks_rapidity/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -70,6 +71,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -86,6 +88,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -102,6 +105,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -112,6 +116,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -122,6 +127,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -132,6 +138,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -142,6 +149,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale From 97d316e81041f6d66ba11493a5e75def30ed5f03 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 1 Dec 2020 22:49:17 +0300 Subject: [PATCH 026/274] bug fixed --- setups/hades/correction-auau-123-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 29cf48a5..5382b135 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -82,7 +82,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: Mb_protons type: track @@ -99,7 +99,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: R1 type: track From db68b698678f49c289ffb94c3ad63d051c925944 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 2 Dec 2020 21:35:08 +0300 Subject: [PATCH 027/274] normalization added --- setups/hades/mc-correction-auau-123.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 754f2fa7..f671f913 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -38,6 +38,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -58,6 +59,7 @@ hades_analysis: type: track phi: sim_tracks/phi weight: Ones + norm: m axes: - *axis_gen_pT - *axis_gen_rapidity From 9f99971693a4f019510f56f60d42db3c5c9ea5e4 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 3 Dec 2020 14:29:01 +0300 Subject: [PATCH 028/274] correction step fixed --- setups/hades/mc-correlation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index c4fa2e36..ab983f18 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -27,7 +27,7 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: sumw - &ta_sim query: { tags: { any-in: [ gen_un_vector ] } } From 1c6892032ee2fb6e5b029a28a7ba80f276726575 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 3 Dec 2020 21:20:58 +0300 Subject: [PATCH 029/274] normalization fixed --- setups/hades/correction-auau-123.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index c71d1a84..d089e2e1 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -58,6 +58,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -78,6 +79,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -94,6 +96,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -110,6 +113,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -120,6 +124,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -130,6 +135,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -140,6 +146,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -150,6 +157,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale From 075588ef062c227cd8f9902e6add23821aed4012 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 4 Dec 2020 19:16:40 +0300 Subject: [PATCH 030/274] correlations with BK angles from Evt-chara --- setups/hades/correction-agag-158.yml | 14 ++- setups/hades/correlation-agag-158.yml | 164 ++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 setups/hades/correlation-agag-158.yml diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index 5c10b718..ec966335 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -57,7 +57,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks/phi weight: Ones - norm: none + norm: m corrections: - recentering - twist-and-rescale @@ -154,4 +154,14 @@ hades_analysis: - recentering - twist-and-rescale cuts: - *w3_cuts \ No newline at end of file + *w3_cuts + - name: wall_plain + type: psi + phi: event_header/fw_angle_plain + weight: Ones + norm: m + - name: wall_bk_corr + type: psi + phi: event_header/fw_angle_shift_charge_rotation + weight: Ones + norm: m \ No newline at end of file diff --git a/setups/hades/correlation-agag-158.yml b/setups/hades/correlation-agag-158.yml new file mode 100644 index 00000000..5c176650 --- /dev/null +++ b/setups/hades/correlation-agag-158.yml @@ -0,0 +1,164 @@ +_detectors: &detectors + - name: u + tags: [ un_vector ] + - name: W1 + tags: [ qn_vector ] + - name: W2 + tags: [ qn_vector ] + - name: W3 + tags: [ qn_vector ] + - name: R1 + tags: [ rnd_vector ] + - name: R2 + tags: [ rnd_vector ] + - name: wall_plain + tags: [ wall_angles ] + - name: wall_bk_corr + tags: [ wall_angles ] + - name: Mf_protons + tags: [ qn_vector ] + - name: Mb_protons + tags: [ qn_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + - &ep_components + [ cos1,sin1 ] + +_tasks: + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components # + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/EP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components # + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/EP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ wall_angles ] } } + query-list: *detectors + components: *ep_components # + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/EP" + axes: [ *centrality ] + # Reference x Reference + - args: + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/EP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/EP" + axes: [ *centrality ] \ No newline at end of file From d1efe5bb2e4b123db61af3ac7194f269e5a883f4 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 4 Dec 2020 19:59:30 +0300 Subject: [PATCH 031/274] only one wall angle --- setups/hades/correction-agag-158.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index ec966335..87d830af 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -155,11 +155,11 @@ hades_analysis: - twist-and-rescale cuts: *w3_cuts - - name: wall_plain - type: psi - phi: event_header/fw_angle_plain - weight: Ones - norm: m +# - name: wall_plain +# type: psi +# phi: event_header/fw_angle_plain +# weight: Ones +# norm: m - name: wall_bk_corr type: psi phi: event_header/fw_angle_shift_charge_rotation From 2f1a2c34f207c322eafd7c81406870133f9de376 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 5 Dec 2020 01:50:43 +0300 Subject: [PATCH 032/274] only one wall angle --- setups/hades/correlation-agag-158.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/correlation-agag-158.yml b/setups/hades/correlation-agag-158.yml index 5c176650..52e77d65 100644 --- a/setups/hades/correlation-agag-158.yml +++ b/setups/hades/correlation-agag-158.yml @@ -11,8 +11,8 @@ _detectors: &detectors tags: [ rnd_vector ] - name: R2 tags: [ rnd_vector ] - - name: wall_plain - tags: [ wall_angles ] +# - name: wall_plain +# tags: [ wall_angles ] - name: wall_bk_corr tags: [ wall_angles ] - name: Mf_protons From e5e863bfc5901e10ec463c84b5e77a2cdc55fa78 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 5 Dec 2020 13:54:49 +0300 Subject: [PATCH 033/274] plain step on wall bk angle --- setups/hades/correlation-agag-158.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correlation-agag-158.yml b/setups/hades/correlation-agag-158.yml index 52e77d65..c9c980bc 100644 --- a/setups/hades/correlation-agag-158.yml +++ b/setups/hades/correlation-agag-158.yml @@ -103,7 +103,7 @@ _tasks: - query: { tags: { any-in: [ wall_angles ] } } query-list: *detectors components: *ep_components # - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: ones n-samples: 100 weights-type: observable From 8535d2667a34dec85756b37a4db1746bb1954244 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 5 Dec 2020 16:36:08 +0300 Subject: [PATCH 034/274] chi2 cut for all tracks --- setups/hades/correction-auau-123-all.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 5382b135..0abee1ee 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -61,6 +61,8 @@ hades_analysis: axes: - *axis_pT - *axis_rapidity + cuts: + mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT From 1525fa2ff7b687f8342cc4bc1a78ac7ed8ecf4f1 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 6 Dec 2020 15:28:11 +0300 Subject: [PATCH 035/274] Pion's flow added --- setups/hades/correction-auau-123.yml | 48 ++++++++- setups/hades/correlation-auau-123.yml | 149 ++++++++++++++++++++++++++ 2 files changed, 194 insertions(+), 3 deletions(-) create mode 100644 setups/hades/correlation-auau-123.yml diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index d089e2e1..67f6145a 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -54,7 +54,7 @@ hades_analysis: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: ############################################################# - - name: u + - name: protons type: track phi: mdc_vtx_tracks/phi weight: Ones @@ -75,7 +75,49 @@ hades_analysis: - *axis_rapidity - [*axis_rapidity, *axis_pT] ############################################################# - - name: Mf_protons + - name: pi_plus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT + - *axis_rapidity + cuts-pid: + *pion_plus_cuts + cuts-quality: + *good_particle_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT + - *axis_rapidity + - [*axis_rapidity, *axis_pT] + ############################################################# + - name: pi_minus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT + - *axis_rapidity + cuts-pid: + *pion_minus_cuts + cuts-quality: + *good_particle_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT + - *axis_rapidity + - [*axis_rapidity, *axis_pT] + ############################################################# + - name: Mf type: track phi: mdc_vtx_tracks/phi weight: Ones @@ -92,7 +134,7 @@ hades_analysis: qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - - name: Mb_protons + - name: Mb type: track phi: mdc_vtx_tracks/phi weight: Ones diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml new file mode 100644 index 00000000..32524372 --- /dev/null +++ b/setups/hades/correlation-auau-123.yml @@ -0,0 +1,149 @@ +_detectors: &detectors + - name: protons + tags: [ un_vector ] + - name: pi_plus + tags: [ un_vector ] + - name: pi_minus + tags: [ un_vector ] + - name: W1 + tags: [ qn_vector ] + - name: W2 + tags: [ qn_vector ] + - name: W3 + tags: [ qn_vector ] + - name: R1 + tags: [ rnd_vector ] + - name: R2 + tags: [ rnd_vector ] + - name: Mf + tags: [ qn_vector ] + - name: Mb + tags: [ qn_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + - &ep_components + [ cos1,sin1 ] + +_tasks: + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components # + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/EP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components # + correction-steps: [ rescaled ] + weight: ones + n-samples: 100 + weights-type: observable + folder: "/uQ/EP" + axes: [ *centrality ] + # Reference x Reference + - args: + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/SP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/EP" + axes: [ *centrality ] + - args: + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + - query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + n-samples: 100 + weights-type: reference + folder: "/QQ/EP" + axes: [ *centrality ] \ No newline at end of file From d039472d2c84a81533cda04eadd0ea8f67d69a44 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 6 Dec 2020 15:36:28 +0300 Subject: [PATCH 036/274] Pion's flow added --- setups/hades/mc-correction-auau-123.yml | 101 ++++++++++++++++++++++-- setups/hades/mc-correlation.yml | 15 ++-- 2 files changed, 103 insertions(+), 13 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index f671f913..24c2c9ff 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -18,11 +18,21 @@ _axes: lo: -0.01 hi: 1.49 _cuts: - - &pid_cut + - &pid_protons_cut mdc_vtx_tracks/pid: { equals: 2212 } - - &gen_prim_cut + - &pid_pi_plus_cut + mdc_vtx_tracks/pid: { equals: 211 } + - &pid_pi_minus_cut + mdc_vtx_tracks/pid: { equals: -211 } + - &gen_prim_protons_cut sim_tracks/pid: { equals: 2212 } sim_tracks/is_primary: { equals: 1 } + - &gen_prim_pi_plus_cut + sim_tracks/pid: { equals: 211 } + sim_tracks/is_primary: { equals: 1 } + - &gen_prim_pi_minus_cut + sim_tracks/pid: { equals: -211 } + sim_tracks/is_primary: { equals: 1 } - &good_track_cuts mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} @@ -34,7 +44,50 @@ hades_analysis: axes: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: - - name: pid + ########################################################################### + - name: pid_protons + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT + - *axis_rapidity + cuts-pid: + *pid_protons_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT + - *axis_rapidity + - [*axis_rapidity, *axis_pT] + ########################################################################### + - name: pid_pi_plus + type: track + phi: mdc_vtx_tracks/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT + - *axis_rapidity + cuts-pid: + *pid_pi_plus_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT + - *axis_rapidity + - [*axis_rapidity, *axis_pT] + ########################################################################### + - name: pid_pi_minus type: track phi: mdc_vtx_tracks/phi weight: Ones @@ -46,7 +99,7 @@ hades_analysis: - *axis_pT - *axis_rapidity cuts-pid: - *pid_cut + *pid_pi_minus_cut cuts-quality: *good_track_cuts qa: @@ -54,8 +107,40 @@ hades_analysis: - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] -########################################################################### - - name: gen_prim + ########################################################################### + - name: gen_prim_protons + type: track + phi: sim_tracks/phi + weight: Ones + norm: m + axes: + - *axis_gen_pT + - *axis_gen_rapidity + cuts-pid: + *gen_prim_protons_cut + qa: + - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_pT + - *axis_gen_rapidity + - [*axis_gen_rapidity, *axis_gen_pT] + ########################################################################### + - name: gen_prim_pi_plus + type: track + phi: sim_tracks/phi + weight: Ones + norm: m + axes: + - *axis_gen_pT + - *axis_gen_rapidity + cuts-pid: + *gen_prim_pi_plus_cut + qa: + - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_pT + - *axis_gen_rapidity + - [*axis_gen_rapidity, *axis_gen_pT] + ########################################################################### + - name: gen_prim_pi_minus type: track phi: sim_tracks/phi weight: Ones @@ -64,13 +149,13 @@ hades_analysis: - *axis_gen_pT - *axis_gen_rapidity cuts-pid: - *gen_prim_cut + *gen_prim_pi_minus_cut qa: - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_pT - *axis_gen_rapidity - [*axis_gen_rapidity, *axis_gen_pT] -########################################################################### + ########################################################################### - name: psi_rp type: psi phi: sim_header/reaction_plane diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index ab983f18..bb31cdba 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -1,13 +1,18 @@ _detectors: &detectors - - name: pid + - name: pid_protons tags: [ un_vector ] - correction-step: rescaled - - name: gen_prim + - name: pid_pi_plus + tags: [ un_vector ] + - name: pid_pi_minus + tags: [ un_vector ] + - name: gen_prim_protons + tags: [ gen_un_vector ] + - name: gen_prim_pi_plus + tags: [ gen_un_vector ] + - name: gen_prim_pi_minus tags: [ gen_un_vector ] - correction-step: plain - name: psi_rp tags: [ psi_vector ] - correction-step: plain _axes: - ¢rality From fbc27a4eb50cf0dbd683dae728eaa4df37a2c104 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 7 Dec 2020 22:12:30 +0300 Subject: [PATCH 037/274] plain u-vector in correlation with BK angle --- setups/hades/correlation-agag-158.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correlation-agag-158.yml b/setups/hades/correlation-agag-158.yml index c9c980bc..1973fc8c 100644 --- a/setups/hades/correlation-agag-158.yml +++ b/setups/hades/correlation-agag-158.yml @@ -98,7 +98,7 @@ _tasks: - query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - query: { tags: { any-in: [ wall_angles ] } } query-list: *detectors From 0018b5e1beddd2e97a963404ce0c4bbb41d20b7f Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 7 Dec 2020 23:50:55 +0300 Subject: [PATCH 038/274] plain BK angle --- setups/hades/correction-agag-158.yml | 16 ++++++++-------- setups/hades/correlation-agag-158.yml | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index 87d830af..a71285f9 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -155,13 +155,13 @@ hades_analysis: - twist-and-rescale cuts: *w3_cuts -# - name: wall_plain -# type: psi -# phi: event_header/fw_angle_plain -# weight: Ones -# norm: m - - name: wall_bk_corr + - name: wall_plain type: psi - phi: event_header/fw_angle_shift_charge_rotation + phi: event_header/fw_angle_plain weight: Ones - norm: m \ No newline at end of file + norm: m +# - name: wall_bk_corr +# type: psi +# phi: event_header/fw_angle_shift_charge_rotation +# weight: Ones +# norm: m \ No newline at end of file diff --git a/setups/hades/correlation-agag-158.yml b/setups/hades/correlation-agag-158.yml index 1973fc8c..5451a657 100644 --- a/setups/hades/correlation-agag-158.yml +++ b/setups/hades/correlation-agag-158.yml @@ -11,10 +11,10 @@ _detectors: &detectors tags: [ rnd_vector ] - name: R2 tags: [ rnd_vector ] -# - name: wall_plain -# tags: [ wall_angles ] - - name: wall_bk_corr + - name: wall_plain tags: [ wall_angles ] +# - name: wall_bk_corr +# tags: [ wall_angles ] - name: Mf_protons tags: [ qn_vector ] - name: Mb_protons From 161358a5a9479abf30cc6587aacbb53877810be0 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 8 Dec 2020 21:23:28 +0300 Subject: [PATCH 039/274] efficiency weighting --- setups/hades/correction-auau-123-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 0abee1ee..351996d9 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -53,7 +53,7 @@ hades_analysis: - name: u type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering From cb7d7e9d2fb5ee2c66fee4b6a290a612a872139d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 9 Dec 2020 23:35:01 +0300 Subject: [PATCH 040/274] efficiency weighting added --- setups/hades/mc-correction-auau-123.yml | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 24c2c9ff..7d2517f3 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -2,13 +2,13 @@ _layouts: _axes: - &axis_pT - name: mdc_vtx_tracks/pT + name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_gen_pT name: sim_tracks/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity - name: mdc_vtx_tracks/rapidity + name: mdc_vtx_tracks_rapidity/rapidity nb: 15 lo: -0.01 hi: 1.49 @@ -19,11 +19,11 @@ _axes: hi: 1.49 _cuts: - &pid_protons_cut - mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks_rapidity/pid: { equals: 2212 } - &pid_pi_plus_cut - mdc_vtx_tracks/pid: { equals: 211 } + mdc_vtx_tracks_rapidity/pid: { equals: 211 } - &pid_pi_minus_cut - mdc_vtx_tracks/pid: { equals: -211 } + mdc_vtx_tracks_rapidity/pid: { equals: -211 } - &gen_prim_protons_cut sim_tracks/pid: { equals: 2212 } sim_tracks/is_primary: { equals: 1 } @@ -34,9 +34,9 @@ _cuts: sim_tracks/pid: { equals: -211 } sim_tracks/is_primary: { equals: 1 } - &good_track_cuts - mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} hades_analysis: event-variables: @@ -47,7 +47,7 @@ hades_analysis: ########################################################################### - name: pid_protons type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -61,14 +61,14 @@ hades_analysis: cuts-quality: *good_track_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] ########################################################################### - name: pid_pi_plus type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -82,14 +82,14 @@ hades_analysis: cuts-quality: *good_track_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] ########################################################################### - name: pid_pi_minus type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -103,7 +103,7 @@ hades_analysis: cuts-quality: *good_track_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] From e6f37b7d21cd8c513de2d4b76cd4cdfbd9d07f9d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 10 Dec 2020 14:01:42 +0300 Subject: [PATCH 041/274] branch with efficiency --- setups/hades/correction-auau-123.yml | 44 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 67f6145a..87f928ec 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -2,30 +2,30 @@ _layouts: _axes: - &axis_pT - name: mdc_vtx_tracks/pT + name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity - name: mdc_vtx_tracks/rapidity + name: mdc_vtx_tracks_rapidity/rapidity nb: 15 lo: -0.01 hi: 1.49 _cuts: - &protons_cuts - mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks_rapidity/pid: { equals: 2212 } - &pion_plus_cuts - mdc_vtx_tracks/pid: { equals: 211 } + mdc_vtx_tracks_rapidity/pid: { equals: 211 } - &pion_minus_cuts - mdc_vtx_tracks/pid: { equals: -211 } + mdc_vtx_tracks_rapidity/pid: { equals: -211 } - &good_particle_cuts - mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} - &mf_cuts - mdc_vtx_tracks/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_rapidity/rapidity: {range: [1.09, 1.29]} - &mb_cuts - mdc_vtx_tracks/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} + mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_rapidity/rapidity: {range: [0.19, 0.39]} - &r1_cuts forward_wall_hits/rnd_sub: { equals: 0 } forward_wall_hits/time: { range: [22.681788, 28.352235] } @@ -56,7 +56,7 @@ hades_analysis: ############################################################# - name: protons type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -70,14 +70,14 @@ hades_analysis: cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] ############################################################# - name: pi_plus type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -91,14 +91,14 @@ hades_analysis: cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] ############################################################# - name: pi_minus type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -112,14 +112,14 @@ hades_analysis: cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] ############################################################# - name: Mf type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -132,11 +132,11 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: Mb type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -149,7 +149,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: R1 type: track From 2dd0eb32e0ccac40b1788242853d17a7ac71bdbf Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 13 Dec 2020 22:58:57 +0300 Subject: [PATCH 042/274] different pT-binnig for pions --- setups/hades/correction-auau-123.yml | 23 +++++++++++++---------- setups/observables-calculation-config.yml | 6 +++--- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 87f928ec..c00ec7f1 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -1,9 +1,12 @@ _layouts: _axes: - - &axis_pT + - &axis_protons_pT name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_pions_pT + name: mdc_vtx_tracks_rapidity/pT + bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_rapidity name: mdc_vtx_tracks_rapidity/rapidity nb: 15 @@ -63,7 +66,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT + - *axis_protons_pT - *axis_rapidity cuts-pid: *protons_cuts @@ -71,9 +74,9 @@ hades_analysis: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT + - *axis_protons_pT - *axis_rapidity - - [*axis_rapidity, *axis_pT] + - [*axis_rapidity, *axis_protons_pT] ############################################################# - name: pi_plus type: track @@ -84,7 +87,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT + - *axis_pions_pT - *axis_rapidity cuts-pid: *pion_plus_cuts @@ -92,9 +95,9 @@ hades_analysis: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT + - *axis_pions_pT - *axis_rapidity - - [*axis_rapidity, *axis_pT] + - [*axis_rapidity, *axis_pions_pT] ############################################################# - name: pi_minus type: track @@ -105,7 +108,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT + - *axis_pions_pT - *axis_rapidity cuts-pid: *pion_minus_cuts @@ -113,9 +116,9 @@ hades_analysis: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT + - *axis_pions_pT - *axis_rapidity - - [*axis_rapidity, *axis_pT] + - [*axis_rapidity, *axis_pions_pT] ############################################################# - name: Mf type: track diff --git a/setups/observables-calculation-config.yml b/setups/observables-calculation-config.yml index 06eab338..bc18aca8 100644 --- a/setups/observables-calculation-config.yml +++ b/setups/observables-calculation-config.yml @@ -11,11 +11,11 @@ _detectors: &detectors correction-step: RESCALED components: [x1,y1] tags: [ep-vectors, res-vectors] - - name: Mf_protons + - name: Mf correction-step: RESCALED components: [x1,y1] tags: [res-vectors] - - name: Mb_protons + - name: Mb correction-step: RESCALED components: [x1,y1] tags: [res-vectors] @@ -24,6 +24,6 @@ _observables: - method: three-sub-event QQ-directory: QQ/SP uQ-directory: uQ/SP - u-vector: {name: u, components: [x1, y1], correction-step: RESCALED} + u-vector: {name: protons, components: [x1, y1], correction-step: RESCALED} EP-vectors: ep-vectors resolution-vectors: res-vectors \ No newline at end of file From d42ed52465691ebda12b58129d0c2eedc1de9a8f Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 13 Dec 2020 23:01:56 +0300 Subject: [PATCH 043/274] different pT-binnig for pions in MC --- setups/hades/mc-correction-auau-123.yml | 46 ++++++++++++++----------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 7d2517f3..95caf6b8 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -1,12 +1,18 @@ _layouts: _axes: - - &axis_pT + - &axis_protons_pT name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - - &axis_gen_pT + - &axis_pions_pT + name: mdc_vtx_tracks_rapidity/pT + bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] + - &axis_gen_protons_pT name: sim_tracks/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_gen_pions_pT + name: sim_tracks/pT + bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_rapidity name: mdc_vtx_tracks_rapidity/rapidity nb: 15 @@ -54,7 +60,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT + - *axis_protons_pT - *axis_rapidity cuts-pid: *pid_protons_cut @@ -62,9 +68,9 @@ hades_analysis: *good_track_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT + - *axis_protons_pT - *axis_rapidity - - [*axis_rapidity, *axis_pT] + - [*axis_rapidity, *axis_protons_pT] ########################################################################### - name: pid_pi_plus type: track @@ -75,7 +81,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT + - *axis_pions_pT - *axis_rapidity cuts-pid: *pid_pi_plus_cut @@ -83,9 +89,9 @@ hades_analysis: *good_track_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT + - *axis_pions_pT - *axis_rapidity - - [*axis_rapidity, *axis_pT] + - [*axis_rapidity, *axis_pions_pT] ########################################################################### - name: pid_pi_minus type: track @@ -96,7 +102,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT + - *axis_pions_pT - *axis_rapidity cuts-pid: *pid_pi_minus_cut @@ -104,9 +110,9 @@ hades_analysis: *good_track_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT + - *axis_pions_pT - *axis_rapidity - - [*axis_rapidity, *axis_pT] + - [*axis_rapidity, *axis_pions_pT] ########################################################################### - name: gen_prim_protons type: track @@ -114,15 +120,15 @@ hades_analysis: weight: Ones norm: m axes: - - *axis_gen_pT + - *axis_gen_protons_pT - *axis_gen_rapidity cuts-pid: *gen_prim_protons_cut qa: - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} - - *axis_gen_pT + - *axis_gen_protons_pT - *axis_gen_rapidity - - [*axis_gen_rapidity, *axis_gen_pT] + - [*axis_gen_rapidity, *axis_gen_protons_pT] ########################################################################### - name: gen_prim_pi_plus type: track @@ -130,15 +136,15 @@ hades_analysis: weight: Ones norm: m axes: - - *axis_gen_pT + - *axis_gen_pions_pT - *axis_gen_rapidity cuts-pid: *gen_prim_pi_plus_cut qa: - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} - - *axis_gen_pT + - *axis_gen_pions_pT - *axis_gen_rapidity - - [*axis_gen_rapidity, *axis_gen_pT] + - [*axis_gen_rapidity, *axis_gen_pions_pT] ########################################################################### - name: gen_prim_pi_minus type: track @@ -146,15 +152,15 @@ hades_analysis: weight: Ones norm: m axes: - - *axis_gen_pT + - *axis_gen_pions_pT - *axis_gen_rapidity cuts-pid: *gen_prim_pi_minus_cut qa: - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} - - *axis_gen_pT + - *axis_gen_pions_pT - *axis_gen_rapidity - - [*axis_gen_rapidity, *axis_gen_pT] + - [*axis_gen_rapidity, *axis_gen_pions_pT] ########################################################################### - name: psi_rp type: psi From ec3850a4251a37326c04a0160020f665507b2f4b Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 14 Dec 2020 13:34:20 +0300 Subject: [PATCH 044/274] mc-all remade for pions flow --- setups/hades/mc-correction-auau-123-all.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 60b40a98..e47296e9 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -1,9 +1,12 @@ _layouts: _axes: - - &axis_gen_pT + - &axis_gen_protons_pT name: sim_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_gen_pions_pT + name: sim_tracks/pT + bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_gen_rapidity name: sim_tracks_rapidity/rapidity nb: 15 @@ -22,13 +25,13 @@ hades_analysis: phi: sim_tracks_rapidity/phi weight: Ones axes: - - *axis_gen_pT + - *axis_gen_pions_pT - *axis_gen_rapidity qa: - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_gen_pT + - *axis_gen_pions_pT - *axis_gen_rapidity - - [*axis_gen_rapidity, *axis_gen_pT] + - [*axis_gen_rapidity, *axis_gen_pions_pT] norm: m ########################################################################### - name: psi_rp From 7b2848abf6d2c0d79c1cf2705d61226642ac6734 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 14 Dec 2020 13:37:45 +0300 Subject: [PATCH 045/274] real-all remade for pions flow --- setups/hades/correction-auau-123-all.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 351996d9..bd274b93 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -1,9 +1,12 @@ _layouts: _axes: - - &axis_pT + - &axis_protons_pT name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_pions_pT + name: mdc_vtx_tracks_rapidity/pT + bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_rapidity name: mdc_vtx_tracks_rapidity/rapidity nb: 15 @@ -59,15 +62,15 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT + - *axis_pions_pT - *axis_rapidity cuts: mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT + - *axis_pions_pT - *axis_rapidity - - [*axis_rapidity, *axis_pT] + - [*axis_rapidity, *axis_pions_pT] ############################################################# - name: Mf_protons type: track From 6354b427ed8cd9ce9f0d30ece24e9bf42d11b14f Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 14 Dec 2020 16:35:26 +0300 Subject: [PATCH 046/274] Axis fixed --- setups/hades/mc-correction-auau-123-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index e47296e9..c4909f65 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -5,7 +5,7 @@ _axes: name: sim_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_gen_pions_pT - name: sim_tracks/pT + name: sim_tracks_rapidity/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_gen_rapidity name: sim_tracks_rapidity/rapidity From d2bec464727bb060ee6588b75ff0f1914c92f28e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 14 Dec 2020 20:52:55 +0300 Subject: [PATCH 047/274] Efficiency axis --- setups/hades/correction-auau-123.yml | 6 ++-- setups/hades/mc-correction-auau-123.yml | 6 ++-- setups/observables-all.yml | 29 ++++++++++++++++ setups/observables-auau.yml | 41 +++++++++++++++++++++++ setups/observables-calculation-config.yml | 2 +- 5 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 setups/observables-all.yml create mode 100644 setups/observables-auau.yml diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index c00ec7f1..ed80ac3c 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -60,7 +60,7 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering @@ -81,7 +81,7 @@ hades_analysis: - name: pi_plus type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering @@ -102,7 +102,7 @@ hades_analysis: - name: pi_minus type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 95caf6b8..46bff4f8 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -54,7 +54,7 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering @@ -75,7 +75,7 @@ hades_analysis: - name: pid_pi_plus type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering @@ -96,7 +96,7 @@ hades_analysis: - name: pid_pi_minus type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering diff --git a/setups/observables-all.yml b/setups/observables-all.yml new file mode 100644 index 00000000..06eab338 --- /dev/null +++ b/setups/observables-all.yml @@ -0,0 +1,29 @@ +_detectors: &detectors + - name: W1 + correction-step: RESCALED + components: [x1,y1] + tags: [ep-vectors, res-vectors] + - name: W2 + correction-step: RESCALED + components: [x1,y1] + tags: [ep-vectors, res-vectors] + - name: W3 + correction-step: RESCALED + components: [x1,y1] + tags: [ep-vectors, res-vectors] + - name: Mf_protons + correction-step: RESCALED + components: [x1,y1] + tags: [res-vectors] + - name: Mb_protons + correction-step: RESCALED + components: [x1,y1] + tags: [res-vectors] + +_observables: + - method: three-sub-event + QQ-directory: QQ/SP + uQ-directory: uQ/SP + u-vector: {name: u, components: [x1, y1], correction-step: RESCALED} + EP-vectors: ep-vectors + resolution-vectors: res-vectors \ No newline at end of file diff --git a/setups/observables-auau.yml b/setups/observables-auau.yml new file mode 100644 index 00000000..d7b0ee46 --- /dev/null +++ b/setups/observables-auau.yml @@ -0,0 +1,41 @@ +_detectors: &detectors + - name: W1 + correction-step: RESCALED + components: [x1,y1] + tags: [ep-vectors, res-vectors] + - name: W2 + correction-step: RESCALED + components: [x1,y1] + tags: [ep-vectors, res-vectors] + - name: W3 + correction-step: RESCALED + components: [x1,y1] + tags: [ep-vectors, res-vectors] + - name: Mf + correction-step: RESCALED + components: [x1,y1] + tags: [res-vectors] + - name: Mb + correction-step: RESCALED + components: [x1,y1] + tags: [res-vectors] + +_observables: + - method: three-sub-event + QQ-directory: QQ/SP + uQ-directory: uQ/SP + u-vector: {name: protons, components: [x1, y1], correction-step: RESCALED} + EP-vectors: ep-vectors + resolution-vectors: res-vectors + - method: three-sub-event + QQ-directory: QQ/SP + uQ-directory: uQ/SP + u-vector: {name: pi_plus, components: [x1, y1], correction-step: RESCALED} + EP-vectors: ep-vectors + resolution-vectors: res-vectors + - method: three-sub-event + QQ-directory: QQ/SP + uQ-directory: uQ/SP + u-vector: {name: pi_minus, components: [x1, y1], correction-step: RESCALED} + EP-vectors: ep-vectors + resolution-vectors: res-vectors \ No newline at end of file diff --git a/setups/observables-calculation-config.yml b/setups/observables-calculation-config.yml index bc18aca8..99a09e9f 100644 --- a/setups/observables-calculation-config.yml +++ b/setups/observables-calculation-config.yml @@ -24,6 +24,6 @@ _observables: - method: three-sub-event QQ-directory: QQ/SP uQ-directory: uQ/SP - u-vector: {name: protons, components: [x1, y1], correction-step: RESCALED} + u-vector: {name: pi_plus, components: [x1, y1], correction-step: RESCALED} EP-vectors: ep-vectors resolution-vectors: res-vectors \ No newline at end of file From 17c457a2958a632fef30ed40e1f5b4a519c9f642 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 15 Dec 2020 13:20:55 +0300 Subject: [PATCH 048/274] Back to old setup --- setups/hades/correction-auau-123.yml | 52 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index ed80ac3c..22e577e9 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -2,33 +2,33 @@ _layouts: _axes: - &axis_protons_pT - name: mdc_vtx_tracks_rapidity/pT + name: mdc_vtx_tracks/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_pions_pT - name: mdc_vtx_tracks_rapidity/pT + name: mdc_vtx_tracks/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_rapidity - name: mdc_vtx_tracks_rapidity/rapidity + name: mdc_vtx_tracks/rapidity nb: 15 lo: -0.01 hi: 1.49 _cuts: - &protons_cuts - mdc_vtx_tracks_rapidity/pid: { equals: 2212 } + mdc_vtx_tracks/pid: { equals: 2212 } - &pion_plus_cuts - mdc_vtx_tracks_rapidity/pid: { equals: 211 } + mdc_vtx_tracks/pid: { equals: 211 } - &pion_minus_cuts - mdc_vtx_tracks_rapidity/pid: { equals: -211 } + mdc_vtx_tracks/pid: { equals: -211 } - &good_particle_cuts - mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} - &mf_cuts - mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_rapidity/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [1.09, 1.29]} - &mb_cuts - mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_rapidity/rapidity: {range: [0.19, 0.39]} + mdc_vtx_tracks/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} - &r1_cuts forward_wall_hits/rnd_sub: { equals: 0 } forward_wall_hits/time: { range: [22.681788, 28.352235] } @@ -59,8 +59,8 @@ hades_analysis: ############################################################# - name: protons type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + phi: mdc_vtx_tracks/phi + weight: Ones norm: m corrections: - recentering @@ -73,15 +73,15 @@ hades_analysis: cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT - *axis_rapidity - [*axis_rapidity, *axis_protons_pT] ############################################################# - name: pi_plus type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + phi: mdc_vtx_tracks/phi + weight: Ones norm: m corrections: - recentering @@ -94,15 +94,15 @@ hades_analysis: cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - *axis_pions_pT - *axis_rapidity - [*axis_rapidity, *axis_pions_pT] ############################################################# - name: pi_minus type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + phi: mdc_vtx_tracks/phi + weight: Ones norm: m corrections: - recentering @@ -115,14 +115,14 @@ hades_analysis: cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - *axis_pions_pT - *axis_rapidity - [*axis_rapidity, *axis_pions_pT] ############################################################# - name: Mf type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: mdc_vtx_tracks/phi weight: Ones norm: m corrections: @@ -135,11 +135,11 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: Mb type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: mdc_vtx_tracks/phi weight: Ones norm: m corrections: @@ -152,7 +152,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: R1 type: track From b8b64f3dfea0c76a8e13d8f01d254543160dccc2 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 15 Dec 2020 22:32:14 +0300 Subject: [PATCH 049/274] - Specified axes for protons and pions - Calculation of flow of all particles for both types: pions and protons recalculated rapidity --- setups/hades/correction-auau-123-all.yml | 40 +++++++++--- setups/hades/correction-auau-123.yml | 71 +++++++++++---------- setups/hades/correlation-all.yml | 8 ++- setups/hades/mc-correction-auau-123-all.yml | 33 ++++++++-- setups/hades/mc-correction-auau-123.yml | 50 +++++++++------ setups/hades/mc-correlation-all.yml | 5 +- 6 files changed, 135 insertions(+), 72 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index bd274b93..673a5ec1 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -7,11 +7,16 @@ _axes: - &axis_pions_pT name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - - &axis_rapidity - name: mdc_vtx_tracks_rapidity/rapidity + - &axis_protons_rapidity + name: mdc_vtx_tracks_rapidity/protons_rapidity nb: 15 lo: -0.01 hi: 1.49 + - &axis_pions_rapidity + name: mdc_vtx_tracks_rapidity/pions_rapidity + nb: 17 + lo: 0.09 + hi: 1.79 _cuts: - &protons_cuts mdc_vtx_tracks/pid: { equals: 2212 } @@ -53,7 +58,26 @@ hades_analysis: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: ############################################################# - - name: u + - name: protons + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: mdc_vtx_tracks_rapidity/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_protons_pT + - *axis_protons_rapidity + cuts: + mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_protons_pT + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] + ############################################################# + - name: pions type: track phi: mdc_vtx_tracks_rapidity/phi weight: mdc_vtx_tracks_rapidity/efficiency @@ -63,16 +87,16 @@ hades_analysis: - twist-and-rescale axes: - *axis_pions_pT - - *axis_rapidity + - *axis_pions_rapidity cuts: mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pions_pT - - *axis_rapidity - - [*axis_rapidity, *axis_pions_pT] + - *axis_pions_rapidity + - [*axis_pions_rapidity, *axis_pions_pT] ############################################################# - - name: Mf_protons + - name: Mf type: track phi: mdc_vtx_tracks/phi weight: Ones @@ -89,7 +113,7 @@ hades_analysis: qa: - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - - name: Mb_protons + - name: Mb type: track phi: mdc_vtx_tracks/phi weight: Ones diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 22e577e9..34a2e6b2 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -2,33 +2,38 @@ _layouts: _axes: - &axis_protons_pT - name: mdc_vtx_tracks/pT + name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_pions_pT - name: mdc_vtx_tracks/pT + name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - - &axis_rapidity - name: mdc_vtx_tracks/rapidity + - &axis_protons_rapidity + name: mdc_vtx_tracks_rapidity/rapidity nb: 15 lo: -0.01 hi: 1.49 + - &axis_pions_rapidity + name: mdc_vtx_tracks_rapidity/rapidity + nb: 17 + lo: 0.09 + hi: 1.79 _cuts: - &protons_cuts - mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks_rapidity/pid: { equals: 2212 } - &pion_plus_cuts - mdc_vtx_tracks/pid: { equals: 211 } + mdc_vtx_tracks_rapidity/pid: { equals: 211 } - &pion_minus_cuts - mdc_vtx_tracks/pid: { equals: -211 } + mdc_vtx_tracks_rapidity/pid: { equals: -211 } - &good_particle_cuts - mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} - &mf_cuts - mdc_vtx_tracks/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_rapidity/rapidity: {range: [1.09, 1.29]} - &mb_cuts - mdc_vtx_tracks/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} + mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_rapidity/rapidity: {range: [0.19, 0.39]} - &r1_cuts forward_wall_hits/rnd_sub: { equals: 0 } forward_wall_hits/time: { range: [22.681788, 28.352235] } @@ -59,7 +64,7 @@ hades_analysis: ############################################################# - name: protons type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -67,20 +72,20 @@ hades_analysis: - twist-and-rescale axes: - *axis_protons_pT - - *axis_rapidity + - *axis_protons_rapidity cuts-pid: *protons_cuts cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT - - *axis_rapidity - - [*axis_rapidity, *axis_protons_pT] + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# - name: pi_plus type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -88,20 +93,20 @@ hades_analysis: - twist-and-rescale axes: - *axis_pions_pT - - *axis_rapidity + - *axis_pions_rapidity cuts-pid: *pion_plus_cuts cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pions_pT - - *axis_rapidity - - [*axis_rapidity, *axis_pions_pT] + - *axis_pions_rapidity + - [*axis_pions_rapidity, *axis_pions_pT] ############################################################# - name: pi_minus type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -109,20 +114,20 @@ hades_analysis: - twist-and-rescale axes: - *axis_pions_pT - - *axis_rapidity + - *axis_pions_rapidity cuts-pid: *pion_minus_cuts cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pions_pT - - *axis_rapidity - - [*axis_rapidity, *axis_pions_pT] + - *axis_pions_rapidity + - [*axis_pions_rapidity, *axis_pions_pT] ############################################################# - name: Mf type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -135,11 +140,11 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: Mb type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -152,7 +157,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: R1 type: track diff --git a/setups/hades/correlation-all.yml b/setups/hades/correlation-all.yml index 2172a896..62fde8db 100644 --- a/setups/hades/correlation-all.yml +++ b/setups/hades/correlation-all.yml @@ -1,5 +1,7 @@ _detectors: &detectors - - name: u + - name: protons + tags: [ un_vector ] + - name: pions tags: [ un_vector ] - name: W1 tags: [ qn_vector ] @@ -11,9 +13,9 @@ _detectors: &detectors tags: [ rnd_vector ] - name: R2 tags: [ rnd_vector ] - - name: Mf_protons + - name: Mf tags: [ qn_vector ] - - name: Mb_protons + - name: Mb tags: [ qn_vector ] _axes: diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index c4909f65..ef8a3b67 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -7,8 +7,13 @@ _axes: - &axis_gen_pions_pT name: sim_tracks_rapidity/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - - &axis_gen_rapidity - name: sim_tracks_rapidity/rapidity + - &axis_gen_pions_rapidity + name: sim_tracks_rapidity/pions_rapidity + nb: 17 + lo: 0.09 + hi: 1.79 + - &axis_gen_protons_rapidity + name: sim_tracks_rapidity/protons_rapidity nb: 15 lo: -0.01 hi: 1.49 @@ -19,19 +24,33 @@ hades_analysis: axes: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: -########################################################################### - - name: gen_all + ########################################################################### + - name: protons + type: track + phi: sim_tracks_rapidity/phi + weight: Ones + axes: + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + qa: + - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + norm: m + ########################################################################### + - name: pions type: track phi: sim_tracks_rapidity/phi weight: Ones axes: - *axis_gen_pions_pT - - *axis_gen_rapidity + - *axis_gen_pions_rapidity qa: - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_pions_pT - - *axis_gen_rapidity - - [*axis_gen_rapidity, *axis_gen_pions_pT] + - *axis_gen_pions_rapidity + - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] norm: m ########################################################################### - name: psi_rp diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 46bff4f8..763f29d4 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -13,16 +13,26 @@ _axes: - &axis_gen_pions_pT name: sim_tracks/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - - &axis_rapidity + - &axis_protons_rapidity name: mdc_vtx_tracks_rapidity/rapidity nb: 15 lo: -0.01 hi: 1.49 - - &axis_gen_rapidity + - &axis_pions_rapidity + name: mdc_vtx_tracks_rapidity/rapidity + nb: 17 + lo: 0.09 + hi: 1.79 + - &axis_gen_protons_rapidity name: sim_tracks/rapidity nb: 15 lo: -0.01 hi: 1.49 + - &axis_gen_pions_rapidity + name: sim_tracks/rapidity + nb: 17 + lo: 0.09 + hi: 1.79 _cuts: - &pid_protons_cut mdc_vtx_tracks_rapidity/pid: { equals: 2212 } @@ -61,7 +71,7 @@ hades_analysis: - twist-and-rescale axes: - *axis_protons_pT - - *axis_rapidity + - *axis_protons_rapidity cuts-pid: *pid_protons_cut cuts-quality: @@ -69,8 +79,8 @@ hades_analysis: qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT - - *axis_rapidity - - [*axis_rapidity, *axis_protons_pT] + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] ########################################################################### - name: pid_pi_plus type: track @@ -82,7 +92,7 @@ hades_analysis: - twist-and-rescale axes: - *axis_pions_pT - - *axis_rapidity + - *axis_pions_rapidity cuts-pid: *pid_pi_plus_cut cuts-quality: @@ -90,8 +100,8 @@ hades_analysis: qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pions_pT - - *axis_rapidity - - [*axis_rapidity, *axis_pions_pT] + - *axis_pions_rapidity + - [*axis_pions_rapidity, *axis_pions_pT] ########################################################################### - name: pid_pi_minus type: track @@ -103,7 +113,7 @@ hades_analysis: - twist-and-rescale axes: - *axis_pions_pT - - *axis_rapidity + - *axis_pions_rapidity cuts-pid: *pid_pi_minus_cut cuts-quality: @@ -111,8 +121,8 @@ hades_analysis: qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pions_pT - - *axis_rapidity - - [*axis_rapidity, *axis_pions_pT] + - *axis_pions_rapidity + - [*axis_pions_rapidity, *axis_pions_pT] ########################################################################### - name: gen_prim_protons type: track @@ -121,14 +131,14 @@ hades_analysis: norm: m axes: - *axis_gen_protons_pT - - *axis_gen_rapidity + - *axis_gen_protons_rapidity cuts-pid: *gen_prim_protons_cut qa: - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT - - *axis_gen_rapidity - - [*axis_gen_rapidity, *axis_gen_protons_pT] + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] ########################################################################### - name: gen_prim_pi_plus type: track @@ -137,14 +147,14 @@ hades_analysis: norm: m axes: - *axis_gen_pions_pT - - *axis_gen_rapidity + - *axis_gen_pions_rapidity cuts-pid: *gen_prim_pi_plus_cut qa: - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_pions_pT - - *axis_gen_rapidity - - [*axis_gen_rapidity, *axis_gen_pions_pT] + - *axis_gen_pions_rapidity + - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] ########################################################################### - name: gen_prim_pi_minus type: track @@ -153,14 +163,14 @@ hades_analysis: norm: m axes: - *axis_gen_pions_pT - - *axis_gen_rapidity + - *axis_gen_pions_rapidity cuts-pid: *gen_prim_pi_minus_cut qa: - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_pions_pT - - *axis_gen_rapidity - - [*axis_gen_rapidity, *axis_gen_pions_pT] + - *axis_gen_pions_rapidity + - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] ########################################################################### - name: psi_rp type: psi diff --git a/setups/hades/mc-correlation-all.yml b/setups/hades/mc-correlation-all.yml index 88e1795d..dee151ea 100644 --- a/setups/hades/mc-correlation-all.yml +++ b/setups/hades/mc-correlation-all.yml @@ -1,5 +1,8 @@ _detectors: &detectors - - name: gen_all + - name: protons + tags: [ gen_un_vector ] + correction-step: plain + - name: pions tags: [ gen_un_vector ] correction-step: plain - name: psi_rp From 7e876e5ddc95c59c7f89b6b8540163252055eed3 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 17 Dec 2020 16:00:32 +0300 Subject: [PATCH 050/274] 100 samples for bootstrapping --- setups/hades/mc-correlation-all.yml | 2 +- setups/hades/mc-correlation.yml | 4 ++-- setups/observables-all.yml | 12 +++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/setups/hades/mc-correlation-all.yml b/setups/hades/mc-correlation-all.yml index dee151ea..8fe1e50e 100644 --- a/setups/hades/mc-correlation-all.yml +++ b/setups/hades/mc-correlation-all.yml @@ -38,7 +38,7 @@ _tasks_args: _tasks: - args: [*ta_all, *ta_psi] - n-samples: 50 + n-samples: 100 weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] \ No newline at end of file diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index bb31cdba..070b7ef3 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -49,12 +49,12 @@ _tasks_args: _tasks: - args: [*ta_reco, *ta_psi] - n-samples: 50 + n-samples: 100 weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] - args: [*ta_sim, *ta_psi] - n-samples: 50 + n-samples: 100 weights-type: observable folder: "/uQ/gen" axes: [ *centrality ] \ No newline at end of file diff --git a/setups/observables-all.yml b/setups/observables-all.yml index 06eab338..ada6eeff 100644 --- a/setups/observables-all.yml +++ b/setups/observables-all.yml @@ -11,11 +11,11 @@ _detectors: &detectors correction-step: RESCALED components: [x1,y1] tags: [ep-vectors, res-vectors] - - name: Mf_protons + - name: Mf correction-step: RESCALED components: [x1,y1] tags: [res-vectors] - - name: Mb_protons + - name: Mb correction-step: RESCALED components: [x1,y1] tags: [res-vectors] @@ -24,6 +24,12 @@ _observables: - method: three-sub-event QQ-directory: QQ/SP uQ-directory: uQ/SP - u-vector: {name: u, components: [x1, y1], correction-step: RESCALED} + u-vector: {name: protons, components: [x1, y1], correction-step: RESCALED} + EP-vectors: ep-vectors + resolution-vectors: res-vectors + - method: three-sub-event + QQ-directory: QQ/SP + uQ-directory: uQ/SP + u-vector: {name: pions, components: [x1, y1], correction-step: RESCALED} EP-vectors: ep-vectors resolution-vectors: res-vectors \ No newline at end of file From 9ac4382f47a252ffd52243247191e6223f397aec Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 21 Dec 2020 20:26:29 +0300 Subject: [PATCH 051/274] reco tracks in setup for all particles flow --- setups/hades/mc-correction-auau-123-all.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index ef8a3b67..3a57149f 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -2,18 +2,18 @@ _layouts: _axes: - &axis_gen_protons_pT - name: sim_tracks_rapidity/pT + name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_gen_pions_pT - name: sim_tracks_rapidity/pT + name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_gen_pions_rapidity - name: sim_tracks_rapidity/pions_rapidity + name: mdc_vtx_tracks_rapidity/pions_rapidity nb: 17 lo: 0.09 hi: 1.79 - &axis_gen_protons_rapidity - name: sim_tracks_rapidity/protons_rapidity + name: mdc_vtx_tracks_rapidity/protons_rapidity nb: 15 lo: -0.01 hi: 1.49 @@ -27,13 +27,13 @@ hades_analysis: ########################################################################### - name: protons type: track - phi: sim_tracks_rapidity/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity qa: - - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT - *axis_gen_protons_rapidity - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] @@ -41,13 +41,13 @@ hades_analysis: ########################################################################### - name: pions type: track - phi: sim_tracks_rapidity/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones axes: - *axis_gen_pions_pT - *axis_gen_pions_rapidity qa: - - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_pions_pT - *axis_gen_pions_rapidity - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] From 68b8bb81eac9b3f0ac1750d8683d04aaa4f12a92 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 24 Dec 2020 23:58:47 +0300 Subject: [PATCH 052/274] efficiency weighting in real Au+Au --- setups/hades/correction-auau-123.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 34a2e6b2..b92e9a75 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -65,7 +65,7 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering @@ -86,7 +86,7 @@ hades_analysis: - name: pi_plus type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering @@ -107,7 +107,7 @@ hades_analysis: - name: pi_minus type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering From a9dbdb17bfbd84cb678d6e5c3b47f3b74f3b2930 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 13 Jan 2021 18:17:18 +0300 Subject: [PATCH 053/274] No efficiency weighting --- setups/hades/mc-correction-auau-123.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 763f29d4..5c0bc3af 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -64,7 +64,7 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + weight: ones norm: m corrections: - recentering @@ -85,7 +85,7 @@ hades_analysis: - name: pid_pi_plus type: track phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + weight: ones norm: m corrections: - recentering @@ -106,7 +106,7 @@ hades_analysis: - name: pid_pi_minus type: track phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + weight: ones norm: m corrections: - recentering From cc2ca86895d56023188743257aaf81dedfde90ac Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 14 Jan 2021 22:25:03 +0300 Subject: [PATCH 054/274] sim tracks --- setups/hades/mc-correction-auau-123-all.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 3a57149f..ef8a3b67 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -2,18 +2,18 @@ _layouts: _axes: - &axis_gen_protons_pT - name: mdc_vtx_tracks_rapidity/pT + name: sim_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_gen_pions_pT - name: mdc_vtx_tracks_rapidity/pT + name: sim_tracks_rapidity/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_gen_pions_rapidity - name: mdc_vtx_tracks_rapidity/pions_rapidity + name: sim_tracks_rapidity/pions_rapidity nb: 17 lo: 0.09 hi: 1.79 - &axis_gen_protons_rapidity - name: mdc_vtx_tracks_rapidity/protons_rapidity + name: sim_tracks_rapidity/protons_rapidity nb: 15 lo: -0.01 hi: 1.49 @@ -27,13 +27,13 @@ hades_analysis: ########################################################################### - name: protons type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: sim_tracks_rapidity/phi weight: Ones axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT - *axis_gen_protons_rapidity - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] @@ -41,13 +41,13 @@ hades_analysis: ########################################################################### - name: pions type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: sim_tracks_rapidity/phi weight: Ones axes: - *axis_gen_pions_pT - *axis_gen_pions_rapidity qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_pions_pT - *axis_gen_pions_rapidity - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] From ce0f39d051923e66e32171b5b092721956c74743 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 19 Jan 2021 19:33:31 +0300 Subject: [PATCH 055/274] Efficiency weighting for mc-auau --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 5c0bc3af..e226e754 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -64,7 +64,7 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_rapidity/phi - weight: ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering From 9d6a8f3f059112021488a7255be2c428c9b9c242 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 23 Jan 2021 18:23:04 +0300 Subject: [PATCH 056/274] none normalization for protons q-vector --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index e226e754..0a6a0bf5 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -65,7 +65,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks_rapidity/phi weight: mdc_vtx_tracks_rapidity/efficiency - norm: m + norm: none corrections: - recentering - twist-and-rescale From 2de1e1ca60945218f7226600a1ccad85a29d070c Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 25 Jan 2021 19:23:58 +0300 Subject: [PATCH 057/274] Avoiding merging --- cmake_modules/QnTools.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake_modules/QnTools.cmake b/cmake_modules/QnTools.cmake index 12b5fe0d..50360ad4 100644 --- a/cmake_modules/QnTools.cmake +++ b/cmake_modules/QnTools.cmake @@ -5,7 +5,7 @@ find_package(QnTools QUIET) include(FetchContent) FetchContent_Declare(QnTools GIT_REPOSITORY https://github.com/HeavyIonAnalysis/QnTools.git - GIT_TAG "master" + GIT_TAG "f39fe1fd34d9b01037e28e369a25c9fe03f0b4e4" # PR: Fix bootstrapping error propagation of scaling and pow operations UPDATE_DISCONNECTED ${UPDATE_DISCONNECTED} ) From ca6414c49721854d0b91575c1a5ff927e665c011 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 6 Feb 2021 18:15:36 +0300 Subject: [PATCH 058/274] spectators vectors added --- setups/hades/mc-correction-auau-123.yml | 36 +++++++++++++++++++++++++ setups/hades/mc-correlation.yml | 27 +++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 0a6a0bf5..5783ac09 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -53,6 +53,12 @@ _cuts: mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} + - &w1_cuts + sim_tracks_rapidity/eta: {range: [3.88, 5.38]} + - &w2_cuts + sim_tracks_rapidity/eta: {range: [3.35, 3.88]} + - &w3_cuts + sim_tracks_rapidity/eta: {range: [2.68, 3.35]} hades_analysis: event-variables: @@ -171,6 +177,36 @@ hades_analysis: - *axis_gen_pions_pT - *axis_gen_pions_rapidity - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] + ########################################################################### + - name: W1_spectators + type: track + phi: sim_tracks_rapidity/phi + weight: sim_tracks_rapidity/charge + norm: m + cuts-w1: + *w1_cuts + qa: + - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + ########################################################################### + - name: W2_spectators + type: track + phi: sim_tracks_rapidity/phi + weight: sim_tracks_rapidity/charge + norm: m + cuts-w2: + *w2_cuts + qa: + - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + ########################################################################### + - name: W3_spectators + type: track + phi: sim_tracks_rapidity/phi + weight: sim_tracks_rapidity/charge + norm: m + cuts-w3: + *w3_cuts + qa: + - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} ########################################################################### - name: psi_rp type: psi diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 070b7ef3..37d524be 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -13,6 +13,12 @@ _detectors: &detectors tags: [ gen_un_vector ] - name: psi_rp tags: [ psi_vector ] + - name: W1_spectators + tags: [ qn_vector ] + - name: W2_spectators + tags: [ qn_vector ] + - name: W3_spectators + tags: [ qn_vector ] _axes: - ¢rality @@ -46,6 +52,12 @@ _tasks_args: components: *ep_components correction-steps: [ plain ] weight: ones + - &ta_qn + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones _tasks: - args: [*ta_reco, *ta_psi] @@ -53,8 +65,23 @@ _tasks: weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] + - args: [*ta_reco, *ta_qn] + n-samples: 100 + weights-type: observable + folder: "/uQ/reco" + axes: [ *centrality ] - args: [*ta_sim, *ta_psi] n-samples: 100 weights-type: observable folder: "/uQ/gen" + axes: [ *centrality ] + - args: [*ta_qn, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/QQ/psi" + axes: [ *centrality ] + - args: [*ta_qn, *ta_qn] + n-samples: 100 + weights-type: reference + folder: "/QQ/qvec" axes: [ *centrality ] \ No newline at end of file From 6a32221481935c39a2925749422da25ab61ba1b1 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 7 Feb 2021 16:52:30 +0300 Subject: [PATCH 059/274] solving the troubles with post-processing --- setups/hades/mc-correlation.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 37d524be..fdc45ac5 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -49,7 +49,7 @@ _tasks_args: - &ta_psi query: { tags: { any-in: [ psi_vector ] } } query-list: *detectors - components: *ep_components + components: *sp_components correction-steps: [ plain ] weight: ones - &ta_qn @@ -78,10 +78,10 @@ _tasks: - args: [*ta_qn, *ta_psi] n-samples: 100 weights-type: observable - folder: "/QQ/psi" + folder: "/QQ/" axes: [ *centrality ] - args: [*ta_qn, *ta_qn] n-samples: 100 weights-type: reference - folder: "/QQ/qvec" + folder: "/QQ/" axes: [ *centrality ] \ No newline at end of file From 347db9c2250f5f19c8d30d68dcba1358b495eeaa Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 7 Feb 2021 18:33:59 +0300 Subject: [PATCH 060/274] segfault fixed --- setups/hades/mc-correlation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index fdc45ac5..5b731189 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -78,10 +78,10 @@ _tasks: - args: [*ta_qn, *ta_psi] n-samples: 100 weights-type: observable - folder: "/QQ/" + folder: "/QQ" axes: [ *centrality ] - args: [*ta_qn, *ta_qn] n-samples: 100 weights-type: reference - folder: "/QQ/" + folder: "/QQ" axes: [ *centrality ] \ No newline at end of file From 2e84b71c9b51838ad2f5b5c97def55ba6a562235 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 7 Feb 2021 22:11:28 +0300 Subject: [PATCH 061/274] reference for correlations --- setups/hades/mc-correlation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 5b731189..402dbb68 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -77,7 +77,7 @@ _tasks: axes: [ *centrality ] - args: [*ta_qn, *ta_psi] n-samples: 100 - weights-type: observable + weights-type: reference folder: "/QQ" axes: [ *centrality ] - args: [*ta_qn, *ta_qn] From 72cc23b53c0a3445e5519db99f1406f0da05bc7e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 8 Feb 2021 15:31:02 +0300 Subject: [PATCH 062/274] normalization to weight for protons' vector --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 5783ac09..651ac3b9 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -71,7 +71,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks_rapidity/phi weight: mdc_vtx_tracks_rapidity/efficiency - norm: none + norm: m corrections: - recentering - twist-and-rescale From bc0cedb872f336b119d3d1b206776994e39a19e4 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 8 Feb 2021 22:58:12 +0300 Subject: [PATCH 063/274] primary spectators --- setups/hades/mc-correction-auau-123.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 651ac3b9..b96b93d7 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -55,10 +55,13 @@ _cuts: mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} - &w1_cuts sim_tracks_rapidity/eta: {range: [3.88, 5.38]} + sim_tracks_rapidity/is_primary: { equals: 1 } - &w2_cuts sim_tracks_rapidity/eta: {range: [3.35, 3.88]} + sim_tracks_rapidity/is_primary: { equals: 1 } - &w3_cuts sim_tracks_rapidity/eta: {range: [2.68, 3.35]} + sim_tracks_rapidity/is_primary: { equals: 1 } hades_analysis: event-variables: From 4a78de50e5219e7666afac63a3a711b17a5dc7e5 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 9 Feb 2021 13:00:06 +0300 Subject: [PATCH 064/274] unite weight --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index b96b93d7..202d234c 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -73,7 +73,7 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + weight: ones norm: m corrections: - recentering From d971f7b8b33a2501719804555811c47029110223 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 12 Feb 2021 20:48:29 +0300 Subject: [PATCH 065/274] new setup with realistic fw --- setups/hades/mc-correction-auau-123.yml | 45 +++++++++++++++---------- setups/hades/mc-correlation.yml | 8 ++--- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 202d234c..ee82a17e 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -54,14 +54,14 @@ _cuts: mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} - &w1_cuts - sim_tracks_rapidity/eta: {range: [3.88, 5.38]} - sim_tracks_rapidity/is_primary: { equals: 1 } + reconstructed_forward_wall_hits/ring: { range: [1.0, 5.0] } + reconstructed_forward_wall_hits/signal: { range: [80.0, 999.0] } - &w2_cuts - sim_tracks_rapidity/eta: {range: [3.35, 3.88]} - sim_tracks_rapidity/is_primary: { equals: 1 } + reconstructed_forward_wall_hits/ring: { range: [6.0, 7.0] } + reconstructed_forward_wall_hits/signal: { range: [85.0, 999.0] } - &w3_cuts - sim_tracks_rapidity/eta: {range: [2.68, 3.35]} - sim_tracks_rapidity/is_primary: { equals: 1 } + reconstructed_forward_wall_hits/ring: { range: [8.0, 10.0] } + reconstructed_forward_wall_hits/signal: { range: [88.0, 999.0] } hades_analysis: event-variables: @@ -181,35 +181,44 @@ hades_analysis: - *axis_gen_pions_rapidity - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] ########################################################################### - - name: W1_spectators + - name: W1 type: track - phi: sim_tracks_rapidity/phi - weight: sim_tracks_rapidity/charge + phi: reconstructed_forward_wall_hits/phi + weight: reconstructed_forward_wall_hits/signal norm: m + corrections: + - recentering + - twist-and-rescale cuts-w1: *w1_cuts qa: - - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} ########################################################################### - - name: W2_spectators + - name: W2 type: track - phi: sim_tracks_rapidity/phi - weight: sim_tracks_rapidity/charge + phi: reconstructed_forward_wall_hits/phi + weight: reconstructed_forward_wall_hits/signal norm: m + corrections: + - recentering + - twist-and-rescale cuts-w2: *w2_cuts qa: - - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} ########################################################################### - - name: W3_spectators + - name: W3 type: track - phi: sim_tracks_rapidity/phi - weight: sim_tracks_rapidity/charge + phi: reconstructed_forward_wall_hits/phi + weight: reconstructed_forward_wall_hits/signal norm: m + corrections: + - recentering + - twist-and-rescale cuts-w3: *w3_cuts qa: - - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} ########################################################################### - name: psi_rp type: psi diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 402dbb68..a6a001b5 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -13,11 +13,11 @@ _detectors: &detectors tags: [ gen_un_vector ] - name: psi_rp tags: [ psi_vector ] - - name: W1_spectators + - name: W1 tags: [ qn_vector ] - - name: W2_spectators + - name: W2 tags: [ qn_vector ] - - name: W3_spectators + - name: W3 tags: [ qn_vector ] _axes: @@ -56,7 +56,7 @@ _tasks_args: query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: ones _tasks: From 44cf6110678442d96e6214b82c0a8cc4f8f09a48 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 13 Feb 2021 20:12:20 +0300 Subject: [PATCH 066/274] Three particles correlations added --- setups/hades/mc-correction-auau-123.yml | 40 +++++++++++++++++++++ setups/hades/mc-correlation.yml | 46 +++++++++++++++++++++++-- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index ee82a17e..cb46ce0d 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -40,6 +40,12 @@ _cuts: mdc_vtx_tracks_rapidity/pid: { equals: 211 } - &pid_pi_minus_cut mdc_vtx_tracks_rapidity/pid: { equals: -211 } + - &mf_cuts + mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_rapidity/rapidity: {range: [1.09, 1.29]} + - &mb_cuts + mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_rapidity/rapidity: {range: [0.19, 0.39]} - &gen_prim_protons_cut sim_tracks/pid: { equals: 2212 } sim_tracks/is_primary: { equals: 1 } @@ -133,6 +139,40 @@ hades_analysis: - *axis_pions_rapidity - [*axis_pions_rapidity, *axis_pions_pT] ########################################################################### + - name: Mf + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mf_cuts + cuts-quality: + *good_track_cuts + cuts-pid: + *pid_protons_cut + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: Mb + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mb_cuts + cuts-quality: + *good_track_cuts + cuts-pid: + *pid_protons_cut + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# - name: gen_prim_protons type: track phi: sim_tracks/phi diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index a6a001b5..3ed5197a 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -19,6 +19,10 @@ _detectors: &detectors tags: [ qn_vector ] - name: W3 tags: [ qn_vector ] + - name: Mf + tags: [ mdc_vector ] + - name: Mb + tags: [ mdc_vector ] _axes: - ¢rality @@ -30,8 +34,8 @@ _axes: _components: - &sp_components [ x1,y1 ] - - &ep_components - [ cos1,sin1 ] + - &sp2_components + [ x2,y2 ] _tasks_args: - &ta_reco @@ -52,12 +56,30 @@ _tasks_args: components: *sp_components correction-steps: [ plain ] weight: ones + - &ta_psi2 + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: ones - &ta_qn query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components correction-steps: [ rescaled ] weight: ones + - &ta_mdc + query: { tags: { any-in: [ mdc_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_mdc2 + query: { tags: { any-in: [ mdc_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: ones _tasks: - args: [*ta_reco, *ta_psi] @@ -70,6 +92,11 @@ _tasks: weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] + - args: [*ta_reco, *ta_qn, *ta_mdc2] + n-samples: 100 + weights-type: observable + folder: "/uQ/reco" + axes: [ *centrality ] - args: [*ta_sim, *ta_psi] n-samples: 100 weights-type: observable @@ -80,7 +107,22 @@ _tasks: weights-type: reference folder: "/QQ" axes: [ *centrality ] + - args: [*ta_mdc, *ta_psi] + n-samples: 100 + weights-type: reference + folder: "/QQ" + axes: [ *centrality ] + - args: [*ta_mdc2, *ta_psi2] + n-samples: 100 + weights-type: reference + folder: "/QQ" + axes: [ *centrality ] - args: [*ta_qn, *ta_qn] + n-samples: 100 + weights-type: reference + folder: "/QQ" + axes: [ *centrality ] + - args: [*ta_mdc, *ta_qn] n-samples: 100 weights-type: reference folder: "/QQ" From 4d6f3bdb31dc87f94dd15d016c3dc7af1a4b1314 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 14 Feb 2021 17:40:08 +0300 Subject: [PATCH 067/274] Three particles correlations added for real data setup --- setups/hades/correction-auau-123.yml | 6 +- setups/hades/correlation-auau-123.yml | 135 +++++++++----------------- 2 files changed, 49 insertions(+), 92 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index b92e9a75..34a2e6b2 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -65,7 +65,7 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + weight: Ones norm: m corrections: - recentering @@ -86,7 +86,7 @@ hades_analysis: - name: pi_plus type: track phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + weight: Ones norm: m corrections: - recentering @@ -107,7 +107,7 @@ hades_analysis: - name: pi_minus type: track phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + weight: Ones norm: m corrections: - recentering diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 32524372..cb6b8a87 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -16,9 +16,9 @@ _detectors: &detectors - name: R2 tags: [ rnd_vector ] - name: Mf - tags: [ qn_vector ] + tags: [ mdc_vector ] - name: Mb - tags: [ qn_vector ] + tags: [ mdc_vector ] _axes: - ¢rality @@ -30,120 +30,77 @@ _axes: _components: - &sp_components [ x1,y1 ] + - &sp2_components + [ x2,y2 ] - &ep_components [ cos1,sin1 ] +_tasks_args: + - &ta_u + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_qn + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_mdc + query: { tags: { any-in: [ mdc_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_mdc2 + query: { tags: { any-in: [ mdc_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: ones + - &ta_rnd + query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + _tasks: - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: ones + - args: [*ta_u, *ta_qn] n-samples: 100 weights-type: observable folder: "/uQ/SP" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: ones + - args: [*ta_u, *ta_rnd] n-samples: 100 weights-type: observable folder: "/uQ/SP" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *ep_components # - correction-steps: [ rescaled ] - weight: ones + - args: [*ta_u, *ta_qn, *ta_mdc2] n-samples: 100 weights-type: observable - folder: "/uQ/EP" - axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *ep_components # - correction-steps: [ rescaled ] - weight: ones - n-samples: 100 - weights-type: observable - folder: "/uQ/EP" + folder: "/uQ/SP" axes: [ *centrality ] # Reference x Reference - - args: - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] + - args: [*ta_qn, *ta_qn] n-samples: 100 weights-type: reference folder: "/QQ/SP" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] + - args: [*ta_mdc, *ta_qn] n-samples: 100 weights-type: reference folder: "/QQ/SP" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] + - args: [*ta_rnd, *ta_rnd] n-samples: 100 weights-type: reference - folder: "/QQ/EP" + folder: "/QQ/SP" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] + - args: [*ta_mdc2, *ta_qn, *ta_qn] n-samples: 100 weights-type: reference - folder: "/QQ/EP" + folder: "/QQ/SP" axes: [ *centrality ] \ No newline at end of file From 6bd96e82a5bdd2395fb379b3cb6cfa684c2f2787 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 18 Feb 2021 17:17:03 +0300 Subject: [PATCH 068/274] setups for Ag+Ag@1.58 updated --- setups/hades/correction-agag-158.yml | 42 +++--- setups/hades/correlation-agag-158.yml | 189 +++++++++++--------------- 2 files changed, 97 insertions(+), 134 deletions(-) diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index a71285f9..ee01d56e 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -2,30 +2,30 @@ _layouts: _axes: - &axis_pT - name: mdc_vtx_tracks/pT + name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity - name: mdc_vtx_tracks/rapidity + name: mdc_vtx_tracks_rapidity/rapidity nb: 15 lo: 0.07 hi: 1.57 _cuts: - &protons_cuts - mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks_rapidity/pid: { equals: 2212 } - &pion_plus_cuts - mdc_vtx_tracks/pid: { equals: 211 } + mdc_vtx_tracks_rapidity/pid: { equals: 211 } - &pion_minus_cuts - mdc_vtx_tracks/pid: { equals: -211 } + mdc_vtx_tracks_rapidity/pid: { equals: -211 } - &good_particle_cuts - mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} - &mf_cuts - mdc_vtx_tracks/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks/rapidity: {range: [1.17, 1.37]} + mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_rapidity/rapidity: {range: [1.17, 1.37]} - &mb_cuts - mdc_vtx_tracks/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks/rapidity: {range: [0.27, 0.47]} + mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_rapidity/rapidity: {range: [0.27, 0.47]} - &r1_cuts forward_wall_hits/rnd_sub: { equals: 0 } forward_wall_hits/time: { range: [22.681788, 28.352235] } @@ -53,9 +53,9 @@ hades_analysis: axes: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: - - name: u + - name: protons type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -69,13 +69,13 @@ hades_analysis: cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] - - name: Mf_protons + - name: Mf type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -88,10 +88,10 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mb_protons + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones norm: m corrections: @@ -104,7 +104,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - name: R1 type: track phi: forward_wall_hits/phi diff --git a/setups/hades/correlation-agag-158.yml b/setups/hades/correlation-agag-158.yml index 5451a657..5557571a 100644 --- a/setups/hades/correlation-agag-158.yml +++ b/setups/hades/correlation-agag-158.yml @@ -1,5 +1,5 @@ _detectors: &detectors - - name: u + - name: protons tags: [ un_vector ] - name: W1 tags: [ qn_vector ] @@ -11,21 +11,17 @@ _detectors: &detectors tags: [ rnd_vector ] - name: R2 tags: [ rnd_vector ] - - name: wall_plain - tags: [ wall_angles ] -# - name: wall_bk_corr -# tags: [ wall_angles ] - - name: Mf_protons - tags: [ qn_vector ] - - name: Mb_protons - tags: [ qn_vector ] + - name: Mf + tags: [ mdc_vector ] + - name: Mb + tags: [ mdc_vector ] _axes: - ¢rality name: event_header_selected_tof_rpc_hits_centrality - nb: 12 + nb: 8 lo: 0 - hi: 60 + hi: 40 _components: - &sp_components @@ -33,132 +29,99 @@ _components: - &ep_components [ cos1,sin1 ] +_tasks_args: + - &ta_u + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_qn_sp + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_qn_ep + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + - &ta_mdc_sp + query: { tags: { any-in: [ mdc_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_mdc_ep + query: { tags: { any-in: [ mdc_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + - &ta_rnd_sp + query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_rnd_ep + query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + _tasks: - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: ones + - args: [*ta_u, *ta_qn_sp] n-samples: 100 weights-type: observable - folder: "/uQ/SP" + folder: "/SP/uQ" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: ones + - args: [*ta_u, *ta_qn_ep] n-samples: 100 weights-type: observable - folder: "/uQ/SP" + folder: "/EP/uQ" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *ep_components # - correction-steps: [ rescaled ] - weight: ones + - args: [*ta_u, *ta_rnd_sp] n-samples: 100 weights-type: observable - folder: "/uQ/EP" + folder: "/SP/uQ" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *ep_components # - correction-steps: [ rescaled ] - weight: ones + - args: [*ta_u, *ta_rnd_ep] n-samples: 100 weights-type: observable - folder: "/uQ/EP" + folder: "/EP/uQ" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ plain ] - weight: sumw - - query: { tags: { any-in: [ wall_angles ] } } - query-list: *detectors - components: *ep_components # - correction-steps: [ plain ] - weight: ones + # Reference x Reference + - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 - weights-type: observable - folder: "/uQ/EP" + weights-type: reference + folder: "/SP/QQ" axes: [ *centrality ] - # Reference x Reference - - args: - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] + - args: [*ta_qn_ep, *ta_qn_ep] + n-samples: 100 + weights-type: reference + folder: "/EP/QQ" + axes: [ *centrality ] + - args: [*ta_mdc_sp, *ta_qn_sp] n-samples: 100 weights-type: reference - folder: "/QQ/SP" + folder: "/SP/QQ" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] + - args: [*ta_mdc_ep, *ta_qn_ep] n-samples: 100 weights-type: reference - folder: "/QQ/SP" + folder: "/EP/QQ" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] + - args: [*ta_rnd_sp, *ta_rnd_sp] n-samples: 100 weights-type: reference - folder: "/QQ/EP" + folder: "/SP/QQ" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] + - args: [*ta_rnd_ep, *ta_rnd_ep] n-samples: 100 weights-type: reference - folder: "/QQ/EP" + folder: "/EP/QQ" axes: [ *centrality ] \ No newline at end of file From 003517705b39e6a0f70f4643dbfb8ce206da6745 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 18 Feb 2021 19:14:31 +0300 Subject: [PATCH 069/274] setups for Ag+Ag@1.23 updated --- setups/hades/correction-agag-123.yml | 120 +++++++++++---------------- 1 file changed, 47 insertions(+), 73 deletions(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 6cd46616..85bc889f 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -2,30 +2,38 @@ _layouts: _axes: - &axis_pT - name: mdc_vtx_tracks/pT + name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity - name: mdc_vtx_tracks/rapidity + name: mdc_vtx_tracks_rapidity/rapidity nb: 15 lo: -0.01 hi: 1.49 _cuts: - &protons_cuts - mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks_rapidity/pid: { equals: 2212 } - &pion_plus_cuts - mdc_vtx_tracks/pid: { equals: 211 } + mdc_vtx_tracks_rapidity/pid: { equals: 211 } - &pion_minus_cuts - mdc_vtx_tracks/pid: { equals: -211 } + mdc_vtx_tracks_rapidity/pid: { equals: -211 } - &good_particle_cuts - mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} - &mf_cuts - mdc_vtx_tracks/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_rapidity/rapidity: {range: [1.09, 1.29]} - &mb_cuts - mdc_vtx_tracks/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} + mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_rapidity/rapidity: {range: [0.19, 0.39]} + - &r1_cuts + forward_wall_hits/rnd_sub: { equals: 0 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &r2_cuts + forward_wall_hits/rnd_sub: { equals: 1 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } - &w1_cuts forward_wall_hits/ring: { range: [1.0, 5.0] } forward_wall_hits/time: { range: [22.681788, 27.002128] } @@ -45,10 +53,11 @@ hades_analysis: axes: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: - - name: u + - name: protons type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -60,14 +69,15 @@ hades_analysis: cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] - - name: Mf_protons + - name: Mf type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -78,11 +88,12 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mb_protons + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - name: Mb type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_rapidity/phi weight: Ones + norm: m corrections: - recentering - twist-and-rescale @@ -93,71 +104,32 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mf_pi_plus - type: track - phi: mdc_vtx_tracks/phi - weight: Ones - corrections: - - recentering - - twist-and-rescale - cuts-subevent: - *mf_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_plus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mb_pi_plus - type: track - phi: mdc_vtx_tracks/phi - weight: Ones - corrections: - - recentering - - twist-and-rescale - cuts-subevent: - *mb_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_plus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mf_pi_minus + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - name: R1 type: track - phi: mdc_vtx_tracks/phi - weight: Ones + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale - cuts-subevent: - *mf_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_minus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} - - name: Mb_pi_minus + cuts: + *r1_cuts + - name: R2 type: track - phi: mdc_vtx_tracks/phi - weight: Ones + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale - cuts-subevent: - *mb_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *pion_minus_cuts - qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + cuts: + *r2_cuts - name: W1 type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -167,6 +139,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale @@ -176,6 +149,7 @@ hades_analysis: type: track phi: forward_wall_hits/phi weight: forward_wall_hits/signal + norm: m corrections: - recentering - twist-and-rescale From 7eda33f46b30d70c555131722e05064213cdf09f Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 18 Feb 2021 19:20:01 +0300 Subject: [PATCH 070/274] setups for Ag+Ag@1.23 updated --- setups/hades/correlation-agag-123.yml | 127 ++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 setups/hades/correlation-agag-123.yml diff --git a/setups/hades/correlation-agag-123.yml b/setups/hades/correlation-agag-123.yml new file mode 100644 index 00000000..5557571a --- /dev/null +++ b/setups/hades/correlation-agag-123.yml @@ -0,0 +1,127 @@ +_detectors: &detectors + - name: protons + tags: [ un_vector ] + - name: W1 + tags: [ qn_vector ] + - name: W2 + tags: [ qn_vector ] + - name: W3 + tags: [ qn_vector ] + - name: R1 + tags: [ rnd_vector ] + - name: R2 + tags: [ rnd_vector ] + - name: Mf + tags: [ mdc_vector ] + - name: Mb + tags: [ mdc_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 8 + lo: 0 + hi: 40 + +_components: + - &sp_components + [ x1,y1 ] + - &ep_components + [ cos1,sin1 ] + +_tasks_args: + - &ta_u + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_qn_sp + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_qn_ep + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + - &ta_mdc_sp + query: { tags: { any-in: [ mdc_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_mdc_ep + query: { tags: { any-in: [ mdc_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + - &ta_rnd_sp + query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_rnd_ep + query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + +_tasks: + - args: [*ta_u, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/uQ" + axes: [ *centrality ] + - args: [*ta_u, *ta_qn_ep] + n-samples: 100 + weights-type: observable + folder: "/EP/uQ" + axes: [ *centrality ] + - args: [*ta_u, *ta_rnd_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/uQ" + axes: [ *centrality ] + - args: [*ta_u, *ta_rnd_ep] + n-samples: 100 + weights-type: observable + folder: "/EP/uQ" + axes: [ *centrality ] + # Reference x Reference + - args: [*ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/QQ" + axes: [ *centrality ] + - args: [*ta_qn_ep, *ta_qn_ep] + n-samples: 100 + weights-type: reference + folder: "/EP/QQ" + axes: [ *centrality ] + - args: [*ta_mdc_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/QQ" + axes: [ *centrality ] + - args: [*ta_mdc_ep, *ta_qn_ep] + n-samples: 100 + weights-type: reference + folder: "/EP/QQ" + axes: [ *centrality ] + - args: [*ta_rnd_sp, *ta_rnd_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/QQ" + axes: [ *centrality ] + - args: [*ta_rnd_ep, *ta_rnd_ep] + n-samples: 100 + weights-type: reference + folder: "/EP/QQ" + axes: [ *centrality ] \ No newline at end of file From a42cc1ab57d706bf3b6835ea0433b6f098232e62 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 18 Feb 2021 23:22:01 +0300 Subject: [PATCH 071/274] Mf Mb correlations added --- setups/hades/correlation-agag-158.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/setups/hades/correlation-agag-158.yml b/setups/hades/correlation-agag-158.yml index 5557571a..0029c1f9 100644 --- a/setups/hades/correlation-agag-158.yml +++ b/setups/hades/correlation-agag-158.yml @@ -115,6 +115,16 @@ _tasks: weights-type: reference folder: "/EP/QQ" axes: [ *centrality ] + - args: [*ta_mdc_sp, *ta_mdc_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/QQ" + axes: [ *centrality ] + - args: [*ta_mdc_ep, *ta_mdc_ep] + n-samples: 100 + weights-type: reference + folder: "/EP/QQ" + axes: [ *centrality ] - args: [*ta_rnd_sp, *ta_rnd_sp] n-samples: 100 weights-type: reference From 2bf3361d0855a2343ae0197f18012ecb69679b71 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 19 Feb 2021 00:38:27 +0300 Subject: [PATCH 072/274] Mf Mb correlations added --- setups/hades/correlation-agag-123.yml | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/setups/hades/correlation-agag-123.yml b/setups/hades/correlation-agag-123.yml index 5557571a..89dc7ee0 100644 --- a/setups/hades/correlation-agag-123.yml +++ b/setups/hades/correlation-agag-123.yml @@ -12,9 +12,9 @@ _detectors: &detectors - name: R2 tags: [ rnd_vector ] - name: Mf - tags: [ mdc_vector ] + tags: [ qn_vector ] - name: Mb - tags: [ mdc_vector ] + tags: [ qn_vector ] _axes: - ¢rality @@ -48,18 +48,6 @@ _tasks_args: components: *ep_components correction-steps: [ rescaled ] weight: ones - - &ta_mdc_sp - query: { tags: { any-in: [ mdc_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: ones - - &ta_mdc_ep - query: { tags: { any-in: [ mdc_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] - weight: ones - &ta_rnd_sp query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors @@ -105,16 +93,6 @@ _tasks: weights-type: reference folder: "/EP/QQ" axes: [ *centrality ] - - args: [*ta_mdc_sp, *ta_qn_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/QQ" - axes: [ *centrality ] - - args: [*ta_mdc_ep, *ta_qn_ep] - n-samples: 100 - weights-type: reference - folder: "/EP/QQ" - axes: [ *centrality ] - args: [*ta_rnd_sp, *ta_rnd_sp] n-samples: 100 weights-type: reference From 9cec8daee5956a0412de64dabedb6ca3a8ff37c5 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 20 Feb 2021 18:18:35 +0300 Subject: [PATCH 073/274] Center-of-mass rapidity instead of laboratory one --- setups/hades/correction-agag-123.yml | 6 ++--- setups/hades/correction-agag-158.yml | 6 ++--- setups/hades/correlation-agag-158.yml | 36 ++------------------------- 3 files changed, 8 insertions(+), 40 deletions(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 85bc889f..e4f171a1 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -5,10 +5,10 @@ _axes: name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity - name: mdc_vtx_tracks_rapidity/rapidity + name: mdc_vtx_tracks_rapidity/ycm nb: 15 - lo: -0.01 - hi: 1.49 + lo: -0.75 + hi: 0.75 _cuts: - &protons_cuts mdc_vtx_tracks_rapidity/pid: { equals: 2212 } diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index ee01d56e..09bb81f8 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -5,10 +5,10 @@ _axes: name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity - name: mdc_vtx_tracks_rapidity/rapidity + name: mdc_vtx_tracks_rapidity/ycm nb: 15 - lo: 0.07 - hi: 1.57 + lo: -0.75 + hi: 0.75 _cuts: - &protons_cuts mdc_vtx_tracks_rapidity/pid: { equals: 2212 } diff --git a/setups/hades/correlation-agag-158.yml b/setups/hades/correlation-agag-158.yml index 0029c1f9..89dc7ee0 100644 --- a/setups/hades/correlation-agag-158.yml +++ b/setups/hades/correlation-agag-158.yml @@ -12,9 +12,9 @@ _detectors: &detectors - name: R2 tags: [ rnd_vector ] - name: Mf - tags: [ mdc_vector ] + tags: [ qn_vector ] - name: Mb - tags: [ mdc_vector ] + tags: [ qn_vector ] _axes: - ¢rality @@ -48,18 +48,6 @@ _tasks_args: components: *ep_components correction-steps: [ rescaled ] weight: ones - - &ta_mdc_sp - query: { tags: { any-in: [ mdc_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: ones - - &ta_mdc_ep - query: { tags: { any-in: [ mdc_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] - weight: ones - &ta_rnd_sp query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors @@ -105,26 +93,6 @@ _tasks: weights-type: reference folder: "/EP/QQ" axes: [ *centrality ] - - args: [*ta_mdc_sp, *ta_qn_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/QQ" - axes: [ *centrality ] - - args: [*ta_mdc_ep, *ta_qn_ep] - n-samples: 100 - weights-type: reference - folder: "/EP/QQ" - axes: [ *centrality ] - - args: [*ta_mdc_sp, *ta_mdc_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/QQ" - axes: [ *centrality ] - - args: [*ta_mdc_ep, *ta_mdc_ep] - n-samples: 100 - weights-type: reference - folder: "/EP/QQ" - axes: [ *centrality ] - args: [*ta_rnd_sp, *ta_rnd_sp] n-samples: 100 weights-type: reference From 9106a39cff5237d47dd107e0be9dc08c7df92cb8 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 23 Feb 2021 14:22:10 +0300 Subject: [PATCH 074/274] rapidity lab -> center-of-mass rapidity --- setups/hades/mc-correction-auau-123.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index cb46ce0d..222daf82 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -14,12 +14,12 @@ _axes: name: sim_tracks/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_protons_rapidity - name: mdc_vtx_tracks_rapidity/rapidity + name: mdc_vtx_tracks_rapidity/ycm nb: 15 lo: -0.01 hi: 1.49 - &axis_pions_rapidity - name: mdc_vtx_tracks_rapidity/rapidity + name: mdc_vtx_tracks_rapidity/ycm nb: 17 lo: 0.09 hi: 1.79 From d34205941fdd69a1eb6b7a2d7ff246f7022bece5 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 23 Feb 2021 14:24:12 +0300 Subject: [PATCH 075/274] rapidity lab -> center-of-mass rapidity --- setups/hades/correction-auau-123.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 34a2e6b2..a56f45b1 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -8,15 +8,15 @@ _axes: name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_protons_rapidity - name: mdc_vtx_tracks_rapidity/rapidity + name: mdc_vtx_tracks_rapidity/ycm nb: 15 - lo: -0.01 - hi: 1.49 + lo: -0.75 + hi: 0.75 - &axis_pions_rapidity - name: mdc_vtx_tracks_rapidity/rapidity + name: mdc_vtx_tracks_rapidity/ycm nb: 17 - lo: 0.09 - hi: 1.79 + lo: -0.65 + hi: 0.95 _cuts: - &protons_cuts mdc_vtx_tracks_rapidity/pid: { equals: 2212 } From 6eac13ef42a4d7608fd6bb66d156e0b32bbc0004 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 23 Feb 2021 23:06:13 +0300 Subject: [PATCH 076/274] adequate correlations --- setups/hades/correlation-auau-123.yml | 55 ++++++++++++++------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index cb6b8a87..bd8be622 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -16,9 +16,9 @@ _detectors: &detectors - name: R2 tags: [ rnd_vector ] - name: Mf - tags: [ mdc_vector ] + tags: [ qn_vector ] - name: Mb - tags: [ mdc_vector ] + tags: [ qn_vector ] _axes: - ¢rality @@ -30,8 +30,6 @@ _axes: _components: - &sp_components [ x1,y1 ] - - &sp2_components - [ x2,y2 ] - &ep_components [ cos1,sin1 ] @@ -42,25 +40,25 @@ _tasks_args: components: *sp_components correction-steps: [ rescaled ] weight: sumw - - &ta_qn + - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components correction-steps: [ rescaled ] weight: ones - - &ta_mdc - query: { tags: { any-in: [ mdc_vector ] } } + - &ta_qn_ep + query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors - components: *sp_components + components: *ep_components correction-steps: [ rescaled ] weight: ones - - &ta_mdc2 - query: { tags: { any-in: [ mdc_vector ] } } + - &ta_rnd_sp + query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors - components: *sp2_components + components: *sp_components correction-steps: [ rescaled ] weight: ones - - &ta_rnd + - &ta_rnd_ep query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors components: *ep_components @@ -68,39 +66,44 @@ _tasks_args: weight: ones _tasks: - - args: [*ta_u, *ta_qn] + - args: [*ta_u, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/uQ" + axes: [ *centrality ] + - args: [*ta_u, *ta_qn_ep] n-samples: 100 weights-type: observable - folder: "/uQ/SP" + folder: "/EP/uQ" axes: [ *centrality ] - - args: [*ta_u, *ta_rnd] + - args: [*ta_u, *ta_rnd_sp] n-samples: 100 weights-type: observable - folder: "/uQ/SP" + folder: "/SP/uQ" axes: [ *centrality ] - - args: [*ta_u, *ta_qn, *ta_mdc2] + - args: [*ta_u, *ta_rnd_ep] n-samples: 100 weights-type: observable - folder: "/uQ/SP" + folder: "/EP/uQ" axes: [ *centrality ] # Reference x Reference - - args: [*ta_qn, *ta_qn] + - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: reference - folder: "/QQ/SP" + folder: "/SP/QQ" axes: [ *centrality ] - - args: [*ta_mdc, *ta_qn] + - args: [*ta_qn_ep, *ta_qn_ep] n-samples: 100 weights-type: reference - folder: "/QQ/SP" + folder: "/EP/QQ" axes: [ *centrality ] - - args: [*ta_rnd, *ta_rnd] + - args: [*ta_rnd_sp, *ta_rnd_sp] n-samples: 100 weights-type: reference - folder: "/QQ/SP" + folder: "/SP/QQ" axes: [ *centrality ] - - args: [*ta_mdc2, *ta_qn, *ta_qn] + - args: [*ta_rnd_ep, *ta_rnd_ep] n-samples: 100 weights-type: reference - folder: "/QQ/SP" + folder: "/EP/QQ" axes: [ *centrality ] \ No newline at end of file From 27573f6f4464c3ac461b8b23cf6bdcf9e4fb1552 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 24 Feb 2021 16:40:00 +0300 Subject: [PATCH 077/274] rapidity fixed, new correlations --- setups/hades/mc-correction-auau-123.yml | 8 ++--- setups/hades/mc-correlation.yml | 44 ++----------------------- 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 222daf82..71609ccf 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -14,12 +14,12 @@ _axes: name: sim_tracks/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_protons_rapidity - name: mdc_vtx_tracks_rapidity/ycm + name: mdc_vtx_tracks_rapidity/rapidity nb: 15 lo: -0.01 hi: 1.49 - &axis_pions_rapidity - name: mdc_vtx_tracks_rapidity/ycm + name: mdc_vtx_tracks_rapidity/rapidity nb: 17 lo: 0.09 hi: 1.79 @@ -79,7 +79,7 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_rapidity/phi - weight: ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering @@ -155,7 +155,7 @@ hades_analysis: *pid_protons_cut qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - ############################################################# + ############################################################# - name: Mb type: track phi: mdc_vtx_tracks_rapidity/phi diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 3ed5197a..a10d9836 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -20,9 +20,9 @@ _detectors: &detectors - name: W3 tags: [ qn_vector ] - name: Mf - tags: [ mdc_vector ] + tags: [ qn_vector ] - name: Mb - tags: [ mdc_vector ] + tags: [ qn_vector ] _axes: - ¢rality @@ -34,8 +34,6 @@ _axes: _components: - &sp_components [ x1,y1 ] - - &sp2_components - [ x2,y2 ] _tasks_args: - &ta_reco @@ -56,30 +54,12 @@ _tasks_args: components: *sp_components correction-steps: [ plain ] weight: ones - - &ta_psi2 - query: { tags: { any-in: [ psi_vector ] } } - query-list: *detectors - components: *sp2_components - correction-steps: [ plain ] - weight: ones - &ta_qn query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components correction-steps: [ rescaled ] weight: ones - - &ta_mdc - query: { tags: { any-in: [ mdc_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: ones - - &ta_mdc2 - query: { tags: { any-in: [ mdc_vector ] } } - query-list: *detectors - components: *sp2_components - correction-steps: [ rescaled ] - weight: ones _tasks: - args: [*ta_reco, *ta_psi] @@ -92,11 +72,6 @@ _tasks: weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] - - args: [*ta_reco, *ta_qn, *ta_mdc2] - n-samples: 100 - weights-type: observable - folder: "/uQ/reco" - axes: [ *centrality ] - args: [*ta_sim, *ta_psi] n-samples: 100 weights-type: observable @@ -107,22 +82,7 @@ _tasks: weights-type: reference folder: "/QQ" axes: [ *centrality ] - - args: [*ta_mdc, *ta_psi] - n-samples: 100 - weights-type: reference - folder: "/QQ" - axes: [ *centrality ] - - args: [*ta_mdc2, *ta_psi2] - n-samples: 100 - weights-type: reference - folder: "/QQ" - axes: [ *centrality ] - args: [*ta_qn, *ta_qn] - n-samples: 100 - weights-type: reference - folder: "/QQ" - axes: [ *centrality ] - - args: [*ta_mdc, *ta_qn] n-samples: 100 weights-type: reference folder: "/QQ" From b9f5474b42d03a5a75d6881a85f95be2b5315bd7 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 25 Feb 2021 21:02:55 +0300 Subject: [PATCH 078/274] pions vector for v1 with three-particle correlations added --- setups/hades/correction-auau-123.yml | 20 ++++++++++++++++++++ setups/hades/correlation-auau-123.yml | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index a56f45b1..ec5cbda2 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -24,6 +24,8 @@ _cuts: mdc_vtx_tracks_rapidity/pid: { equals: 211 } - &pion_minus_cuts mdc_vtx_tracks_rapidity/pid: { equals: -211 } + - &pions_cuts + mdc_vtx_tracks_rapidity/is_pion: { equals: 1 } - &good_particle_cuts mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} @@ -125,6 +127,24 @@ hades_analysis: - *axis_pions_rapidity - [*axis_pions_rapidity, *axis_pions_pT] ############################################################# + - name: pions + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-pid: + *pions_cuts + cuts-quality: + *good_particle_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pions_pT + - *axis_pions_rapidity + - [*axis_pions_rapidity, *axis_pions_pT] + ############################################################# - name: Mf type: track phi: mdc_vtx_tracks_rapidity/phi diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index bd8be622..6ac27c58 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -19,6 +19,8 @@ _detectors: &detectors tags: [ qn_vector ] - name: Mb tags: [ qn_vector ] + - name: pions + tags: [ pions_vector ] _axes: - ¢rality @@ -30,6 +32,8 @@ _axes: _components: - &sp_components [ x1,y1 ] + - &sp2_components + [ x2,y2 ] - &ep_components [ cos1,sin1 ] @@ -64,6 +68,12 @@ _tasks_args: components: *ep_components correction-steps: [ rescaled ] weight: ones + - &ta_pions + query: { tags: { any-in: [ pions_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: ones _tasks: - args: [*ta_u, *ta_qn_sp] @@ -86,6 +96,11 @@ _tasks: weights-type: observable folder: "/EP/uQ" axes: [ *centrality ] + - args: [*ta_u, *ta_pions, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/uQQ" + axes: [ *centrality ] # Reference x Reference - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 @@ -106,4 +121,9 @@ _tasks: n-samples: 100 weights-type: reference folder: "/EP/QQ" + axes: [ *centrality ] + - args: [*ta_pions, *ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/QQQ" axes: [ *centrality ] \ No newline at end of file From 656e04e37a822697c3a1f85facbaa23d40ef7cd6 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 25 Feb 2021 21:50:42 +0300 Subject: [PATCH 079/274] bug fixed --- setups/hades/correction-auau-123.yml | 34 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index ec5cbda2..f40b0b2f 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -127,23 +127,23 @@ hades_analysis: - *axis_pions_rapidity - [*axis_pions_rapidity, *axis_pions_pT] ############################################################# - - name: pions - type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: Ones - norm: m - corrections: - - recentering - - twist-and-rescale - cuts-pid: - *pions_cuts - cuts-quality: - *good_particle_cuts - qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pions_pT - - *axis_pions_rapidity - - [*axis_pions_rapidity, *axis_pions_pT] + - name: pions + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-pid: + *pions_cuts + cuts-quality: + *good_particle_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pions_pT + - *axis_pions_rapidity + - [*axis_pions_rapidity, *axis_pions_pT] ############################################################# - name: Mf type: track From bf4f54ed1e2092623f9b3406d72acb4d26eae525 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 1 Mar 2021 16:00:25 +0300 Subject: [PATCH 080/274] Pions vector removed --- setups/hades/correction-auau-123.yml | 20 -------------------- setups/hades/correlation-auau-123.yml | 20 -------------------- 2 files changed, 40 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index f40b0b2f..a56f45b1 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -24,8 +24,6 @@ _cuts: mdc_vtx_tracks_rapidity/pid: { equals: 211 } - &pion_minus_cuts mdc_vtx_tracks_rapidity/pid: { equals: -211 } - - &pions_cuts - mdc_vtx_tracks_rapidity/is_pion: { equals: 1 } - &good_particle_cuts mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} @@ -127,24 +125,6 @@ hades_analysis: - *axis_pions_rapidity - [*axis_pions_rapidity, *axis_pions_pT] ############################################################# - - name: pions - type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: Ones - norm: m - corrections: - - recentering - - twist-and-rescale - cuts-pid: - *pions_cuts - cuts-quality: - *good_particle_cuts - qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pions_pT - - *axis_pions_rapidity - - [*axis_pions_rapidity, *axis_pions_pT] - ############################################################# - name: Mf type: track phi: mdc_vtx_tracks_rapidity/phi diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 6ac27c58..bd8be622 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -19,8 +19,6 @@ _detectors: &detectors tags: [ qn_vector ] - name: Mb tags: [ qn_vector ] - - name: pions - tags: [ pions_vector ] _axes: - ¢rality @@ -32,8 +30,6 @@ _axes: _components: - &sp_components [ x1,y1 ] - - &sp2_components - [ x2,y2 ] - &ep_components [ cos1,sin1 ] @@ -68,12 +64,6 @@ _tasks_args: components: *ep_components correction-steps: [ rescaled ] weight: ones - - &ta_pions - query: { tags: { any-in: [ pions_vector ] } } - query-list: *detectors - components: *sp2_components - correction-steps: [ rescaled ] - weight: ones _tasks: - args: [*ta_u, *ta_qn_sp] @@ -96,11 +86,6 @@ _tasks: weights-type: observable folder: "/EP/uQ" axes: [ *centrality ] - - args: [*ta_u, *ta_pions, *ta_qn_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/uQQ" - axes: [ *centrality ] # Reference x Reference - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 @@ -121,9 +106,4 @@ _tasks: n-samples: 100 weights-type: reference folder: "/EP/QQ" - axes: [ *centrality ] - - args: [*ta_pions, *ta_qn_sp, *ta_qn_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/QQQ" axes: [ *centrality ] \ No newline at end of file From c8bdf56deb2f8c46e31ee4bcd72a4f3403f01d6d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 3 Mar 2021 01:29:43 +0300 Subject: [PATCH 081/274] axis with uniform pt-bins --- setups/hades/correction-agag-123.yml | 11 ++++++++--- setups/hades/correction-agag-158.yml | 11 ++++++++--- setups/hades/correction-auau-123.yml | 11 ++++++++--- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index e4f171a1..fae80c73 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -4,6 +4,11 @@ _axes: - &axis_pT name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_pT_uniform + name: mdc_vtx_tracks_rapidity/pT + nb: 16 + lo: 0.0 + hi: 1.6 - &axis_rapidity name: mdc_vtx_tracks_rapidity/ycm nb: 15 @@ -62,7 +67,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT + - *axis_pT_uniform - *axis_rapidity cuts-pid: *protons_cuts @@ -70,9 +75,9 @@ hades_analysis: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT + - *axis_pT_uniform - *axis_rapidity - - [*axis_rapidity, *axis_pT] + - [*axis_rapidity, *axis_pT_uniform] - name: Mf type: track phi: mdc_vtx_tracks_rapidity/phi diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index 09bb81f8..de5f586b 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -4,6 +4,11 @@ _axes: - &axis_pT name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_pT_uniform + name: mdc_vtx_tracks_rapidity/pT + nb: 16 + lo: 0.0 + hi: 1.6 - &axis_rapidity name: mdc_vtx_tracks_rapidity/ycm nb: 15 @@ -62,7 +67,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT + - *axis_pT_uniform - *axis_rapidity cuts-pid: *protons_cuts @@ -70,9 +75,9 @@ hades_analysis: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT + - *axis_pT_uniform - *axis_rapidity - - [*axis_rapidity, *axis_pT] + - [*axis_rapidity, *axis_pT_uniform] - name: Mf type: track phi: mdc_vtx_tracks_rapidity/phi diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index a56f45b1..c11ec5ac 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -4,6 +4,11 @@ _axes: - &axis_protons_pT name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_pT_uniform + name: mdc_vtx_tracks_rapidity/pT + nb: 16 + lo: 0.0 + hi: 1.6 - &axis_pions_pT name: mdc_vtx_tracks_rapidity/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] @@ -71,7 +76,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_protons_pT + - *axis_pT_uniform - *axis_protons_rapidity cuts-pid: *protons_cuts @@ -79,9 +84,9 @@ hades_analysis: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_protons_pT + - *axis_pT_uniform - *axis_protons_rapidity - - [*axis_protons_rapidity, *axis_protons_pT] + - [*axis_protons_rapidity, *axis_pT_uniform] ############################################################# - name: pi_plus type: track From 483dc0b391be5450b3835b42948bc1ea00a513f7 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 3 Mar 2021 22:48:10 +0300 Subject: [PATCH 082/274] Back to non-uniform binning --- setups/hades/correction-auau-123.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index c11ec5ac..88eb2161 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -76,7 +76,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT_uniform + - *axis_protons_pT - *axis_protons_rapidity cuts-pid: *protons_cuts @@ -84,9 +84,9 @@ hades_analysis: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT_uniform + - *axis_protons_pT - *axis_protons_rapidity - - [*axis_protons_rapidity, *axis_pT_uniform] + - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# - name: pi_plus type: track From 0f03cd38d2fbb2348ca49b98790bf6c2a01fb8eb Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 8 Mar 2021 19:51:02 +0300 Subject: [PATCH 083/274] Efficiency reweighing and non-uniform binning --- setups/hades/correction-agag-123.yml | 8 ++++---- setups/hades/correction-agag-158.yml | 8 ++++---- setups/hades/correction-auau-123.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index fae80c73..5cb987c3 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -61,13 +61,13 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering - twist-and-rescale axes: - - *axis_pT_uniform + - *axis_pT - *axis_rapidity cuts-pid: *protons_cuts @@ -75,9 +75,9 @@ hades_analysis: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT_uniform + - *axis_pT - *axis_rapidity - - [*axis_rapidity, *axis_pT_uniform] + - [*axis_rapidity, *axis_pT] - name: Mf type: track phi: mdc_vtx_tracks_rapidity/phi diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index de5f586b..0584f01f 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -61,13 +61,13 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering - twist-and-rescale axes: - - *axis_pT_uniform + - *axis_pT - *axis_rapidity cuts-pid: *protons_cuts @@ -75,9 +75,9 @@ hades_analysis: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT_uniform + - *axis_pT - *axis_rapidity - - [*axis_rapidity, *axis_pT_uniform] + - [*axis_rapidity, *axis_pT] - name: Mf type: track phi: mdc_vtx_tracks_rapidity/phi diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 88eb2161..86a224cf 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -70,7 +70,7 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones + weight: mdc_vtx_tracks_rapidity/efficiency norm: m corrections: - recentering From 4780e6face5bfc35c29807ce36416ac5d7671922 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 12 Mar 2021 16:25:55 +0300 Subject: [PATCH 084/274] uniform pT-axis --- setups/hades/correction-auau-123.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 86a224cf..1c2a595e 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -76,7 +76,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_protons_pT + - *axis_pT_uniform - *axis_protons_rapidity cuts-pid: *protons_cuts @@ -84,9 +84,9 @@ hades_analysis: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_protons_pT + - *axis_pT_uniform - *axis_protons_rapidity - - [*axis_protons_rapidity, *axis_protons_pT] + - [*axis_protons_rapidity, *axis_pT_uniform] ############################################################# - name: pi_plus type: track From dd988f0e3d51f3d91d68c5226cdcfde5293a0235 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 16 Mar 2021 14:51:49 +0300 Subject: [PATCH 085/274] weighting = none --- setups/hades/correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 1c2a595e..ca3fac3b 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -71,7 +71,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks_rapidity/phi weight: mdc_vtx_tracks_rapidity/efficiency - norm: m + norm: none corrections: - recentering - twist-and-rescale From 5229e022cfec0eb92839821b673ffd2d28e48818 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 16 Mar 2021 19:57:14 +0300 Subject: [PATCH 086/274] non-uniform binning --- setups/hades/correction-auau-123.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index ca3fac3b..9b0432cf 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -76,7 +76,7 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT_uniform + - *axis_protons_pT - *axis_protons_rapidity cuts-pid: *protons_cuts @@ -84,9 +84,9 @@ hades_analysis: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT_uniform + - *axis_protons_pT - *axis_protons_rapidity - - [*axis_protons_rapidity, *axis_pT_uniform] + - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# - name: pi_plus type: track From 4f48c77dd78b108d99401957c801f837fd481dab Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 17 Mar 2021 13:47:06 +0300 Subject: [PATCH 087/274] No corrections on protons-un --- setups/hades/correction-auau-123.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 9b0432cf..aa40a2fa 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -72,9 +72,9 @@ hades_analysis: phi: mdc_vtx_tracks_rapidity/phi weight: mdc_vtx_tracks_rapidity/efficiency norm: none - corrections: - - recentering - - twist-and-rescale +# corrections: +# - recentering +# - twist-and-rescale axes: - *axis_protons_pT - *axis_protons_rapidity From 11b4edfe03568e775b2e95770b8925de794f34cf Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 17 Mar 2021 14:00:29 +0300 Subject: [PATCH 088/274] vector with uniform binning added. Pions temorary removed --- setups/hades/correction-auau-123.yml | 85 +++++++++++++++++---------- setups/hades/correlation-auau-123.yml | 8 ++- 2 files changed, 58 insertions(+), 35 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index aa40a2fa..0082ebed 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -88,47 +88,68 @@ hades_analysis: - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# - - name: pi_plus + - name: protons_uniform type: track phi: mdc_vtx_tracks_rapidity/phi - weight: Ones - norm: m - corrections: - - recentering - - twist-and-rescale + weight: mdc_vtx_tracks_rapidity/efficiency + norm: none +# corrections: +# - recentering +# - twist-and-rescale axes: - - *axis_pions_pT - - *axis_pions_rapidity + - *axis_pT_uniform + - *axis_protons_rapidity cuts-pid: - *pion_plus_cuts + *protons_cuts cuts-quality: *good_particle_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pions_pT - - *axis_pions_rapidity - - [*axis_pions_rapidity, *axis_pions_pT] + - *axis_pT_uniform + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_pT_uniform] ############################################################# - - name: pi_minus - type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: Ones - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_pions_pT - - *axis_pions_rapidity - cuts-pid: - *pion_minus_cuts - cuts-quality: - *good_particle_cuts - qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pions_pT - - *axis_pions_rapidity - - [*axis_pions_rapidity, *axis_pions_pT] +# - name: pi_plus +# type: track +# phi: mdc_vtx_tracks_rapidity/phi +# weight: Ones +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# axes: +# - *axis_pions_pT +# - *axis_pions_rapidity +# cuts-pid: +# *pion_plus_cuts +# cuts-quality: +# *good_particle_cuts +# qa: +# - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} +# - *axis_pions_pT +# - *axis_pions_rapidity +# - [*axis_pions_rapidity, *axis_pions_pT] +# ############################################################# +# - name: pi_minus +# type: track +# phi: mdc_vtx_tracks_rapidity/phi +# weight: Ones +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# axes: +# - *axis_pions_pT +# - *axis_pions_rapidity +# cuts-pid: +# *pion_minus_cuts +# cuts-quality: +# *good_particle_cuts +# qa: +# - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} +# - *axis_pions_pT +# - *axis_pions_rapidity +# - [*axis_pions_rapidity, *axis_pions_pT] ############################################################# - name: Mf type: track diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index bd8be622..42478d88 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -1,10 +1,12 @@ _detectors: &detectors - name: protons tags: [ un_vector ] - - name: pi_plus - tags: [ un_vector ] - - name: pi_minus + - name: protons_uniform tags: [ un_vector ] +# - name: pi_plus +# tags: [ un_vector ] +# - name: pi_minus +# tags: [ un_vector ] - name: W1 tags: [ qn_vector ] - name: W2 From 2ed2c335c7799e85f585ae1c9d88fb04a9f9d1c7 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 17 Mar 2021 14:03:41 +0300 Subject: [PATCH 089/274] Rnd vectors temporary removed --- setups/hades/correction-auau-123.yml | 42 +++++++++++------------ setups/hades/correlation-auau-123.yml | 48 +++++++++++++-------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 0082ebed..ad75bc34 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -185,27 +185,27 @@ hades_analysis: qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - - name: R1 - type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal - norm: m - corrections: - - recentering - - twist-and-rescale - cuts: - *r1_cuts - ############################################################# - - name: R2 - type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal - norm: m - corrections: - - recentering - - twist-and-rescale - cuts: - *r2_cuts +# - name: R1 +# type: track +# phi: forward_wall_hits/phi +# weight: forward_wall_hits/signal +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts: +# *r1_cuts +# ############################################################# +# - name: R2 +# type: track +# phi: forward_wall_hits/phi +# weight: forward_wall_hits/signal +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts: +# *r2_cuts ############################################################# - name: W1 type: track diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 42478d88..80a890ff 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -13,10 +13,10 @@ _detectors: &detectors tags: [ qn_vector ] - name: W3 tags: [ qn_vector ] - - name: R1 - tags: [ rnd_vector ] - - name: R2 - tags: [ rnd_vector ] +# - name: R1 +# tags: [ rnd_vector ] +# - name: R2 +# tags: [ rnd_vector ] - name: Mf tags: [ qn_vector ] - name: Mb @@ -78,16 +78,16 @@ _tasks: weights-type: observable folder: "/EP/uQ" axes: [ *centrality ] - - args: [*ta_u, *ta_rnd_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/uQ" - axes: [ *centrality ] - - args: [*ta_u, *ta_rnd_ep] - n-samples: 100 - weights-type: observable - folder: "/EP/uQ" - axes: [ *centrality ] +# - args: [*ta_u, *ta_rnd_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/uQ" +# axes: [ *centrality ] +# - args: [*ta_u, *ta_rnd_ep] +# n-samples: 100 +# weights-type: observable +# folder: "/EP/uQ" +# axes: [ *centrality ] # Reference x Reference - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 @@ -99,13 +99,13 @@ _tasks: weights-type: reference folder: "/EP/QQ" axes: [ *centrality ] - - args: [*ta_rnd_sp, *ta_rnd_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/QQ" - axes: [ *centrality ] - - args: [*ta_rnd_ep, *ta_rnd_ep] - n-samples: 100 - weights-type: reference - folder: "/EP/QQ" - axes: [ *centrality ] \ No newline at end of file +# - args: [*ta_rnd_sp, *ta_rnd_sp] +# n-samples: 100 +# weights-type: reference +# folder: "/SP/QQ" +# axes: [ *centrality ] +# - args: [*ta_rnd_ep, *ta_rnd_ep] +# n-samples: 100 +# weights-type: reference +# folder: "/EP/QQ" +# axes: [ *centrality ] \ No newline at end of file From 279385e9478067ba360ed2a7ba307424d72c8f59 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 17 Mar 2021 17:27:08 +0300 Subject: [PATCH 090/274] fix --- setups/hades/correlation-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 80a890ff..b1c771b8 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -40,7 +40,7 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } From e22c9a5bf722fb2c1fa2b5eac6036fbfbefde8af Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 17 Mar 2021 19:07:20 +0300 Subject: [PATCH 091/274] debug configuration --- setups/hades/mc-correction-debug.yml | 200 ++++++++++++++++++++++++++ setups/hades/mc-correlation-debug.yml | 62 ++++++++ 2 files changed, 262 insertions(+) create mode 100644 setups/hades/mc-correction-debug.yml create mode 100644 setups/hades/mc-correlation-debug.yml diff --git a/setups/hades/mc-correction-debug.yml b/setups/hades/mc-correction-debug.yml new file mode 100644 index 00000000..bdcaef28 --- /dev/null +++ b/setups/hades/mc-correction-debug.yml @@ -0,0 +1,200 @@ +_layouts: + +_axes: + - &axis_rapidity + name: mdc_vtx_tracks_rapidity/rapidity + nb: 15 + lo: -0.01 + hi: 1.49 + - &axis_gen_rapidity + name: sim_tracks/rapidity + nb: 15 + lo: -0.01 + hi: 1.49 + - &axis_pT_non_uniform + name: mdc_vtx_tracks_rapidity/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_pT_uniform + name: mdc_vtx_tracks_rapidity/pT + nb: 16 + lo: 0.0 + hi: 1.6 + - &axis_gen_pT_non_uniform + name: sim_tracks/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_gen_pT_uniform + name: sim_tracks/pT + nb: 16 + lo: 0.0 + hi: 1.6 +_cuts: + - &pid_protons_cut + mdc_vtx_tracks_rapidity/pid: { equals: 2212 } + - &gen_prim_protons_cut + sim_tracks/pid: { equals: 2212 } + sim_tracks/is_primary: { equals: 1 } + - &good_track_cuts + mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: + ########################################################################### + - name: rec_non_uniform_none + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: mdc_vtx_tracks_rapidity/efficiency + norm: none + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT_non_uniform + - *axis_rapidity + cuts-pid: + *pid_protons_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT_non_uniform + - *axis_rapidity + - [*axis_rapidity, *axis_pT_non_uniform] + ########################################################################### + - name: rec_non_uniform_m + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: mdc_vtx_tracks_rapidity/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT_non_uniform + - *axis_rapidity + cuts-pid: + *pid_protons_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT_non_uniform + - *axis_rapidity + - [*axis_rapidity, *axis_pT_non_uniform] + ########################################################################### + - name: rec_uniform_none + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: mdc_vtx_tracks_rapidity/efficiency + norm: none + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT_uniform + - *axis_rapidity + cuts-pid: + *pid_protons_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT_uniform + - *axis_rapidity + - [*axis_rapidity, *axis_pT_uniform] + ########################################################################### + - name: rec_uniform_m + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: mdc_vtx_tracks_rapidity/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT_uniform + - *axis_rapidity + cuts-pid: + *pid_protons_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT_uniform + - *axis_rapidity + - [*axis_rapidity, *axis_pT_uniform] + ############################################################# + - name: gen_non_uniform_none + type: track + phi: sim_tracks/phi + weight: Ones + norm: none + axes: + - *axis_gen_pT_non_uniform + - *axis_gen_rapidity + cuts-pid: + *gen_prim_protons_cut + qa: + - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_pT_non_uniform + - *axis_gen_rapidity + - [*axis_gen_rapidity, *axis_gen_pT_non_uniform] + ############################################################# + - name: gen_non_uniform_m + type: track + phi: sim_tracks/phi + weight: m + norm: none + axes: + - *axis_gen_pT_non_uniform + - *axis_gen_rapidity + cuts-pid: + *gen_prim_protons_cut + qa: + - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_pT_non_uniform + - *axis_gen_rapidity + - [*axis_gen_rapidity, *axis_gen_pT_non_uniform] + ############################################################# + - name: gen_uniform_none + type: track + phi: sim_tracks/phi + weight: Ones + norm: none + axes: + - *axis_gen_pT_uniform + - *axis_gen_rapidity + cuts-pid: + *gen_prim_protons_cut + qa: + - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_pT_uniform + - *axis_gen_rapidity + - [*axis_gen_rapidity, *axis_gen_pT_uniform] + ############################################################# + - name: gen_uniform_m + type: track + phi: sim_tracks/phi + weight: m + norm: none + axes: + - *axis_gen_pT_uniform + - *axis_gen_rapidity + cuts-pid: + *gen_prim_protons_cut + qa: + - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_pT_uniform + - *axis_gen_rapidity + - [*axis_gen_rapidity, *axis_gen_pT_uniform] + ########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag \ No newline at end of file diff --git a/setups/hades/mc-correlation-debug.yml b/setups/hades/mc-correlation-debug.yml new file mode 100644 index 00000000..af5cc5c0 --- /dev/null +++ b/setups/hades/mc-correlation-debug.yml @@ -0,0 +1,62 @@ +_detectors: &detectors + - name: rec_non_uniform_none + tags: [ un_vector ] + - name: rec_non_uniform_m + tags: [ un_vector ] + - name: rec_uniform_none + tags: [ un_vector ] + - name: rec_uniform_m + tags: [ un_vector ] + - name: gen_non_uniform_none + tags: [ gen_un_vector ] + - name: gen_non_uniform_m + tags: [ gen_un_vector ] + - name: gen_uniform_none + tags: [ gen_un_vector ] + - name: gen_uniform_m + tags: [ gen_un_vector ] + - name: psi_rp + tags: [ psi_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + +_tasks_args: + - &ta_reco + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain, recentered, rescaled ] + weight: sumw + - &ta_sim + query: { tags: { any-in: [ gen_un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_reco, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/reco" + axes: [ *centrality ] + - args: [*ta_sim, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/gen" + axes: [ *centrality ] \ No newline at end of file From ab7a507416c481d98ef022f05166a8a164dbac04 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 18 Mar 2021 15:20:47 +0300 Subject: [PATCH 092/274] bugfix --- setups/hades/mc-correction-debug.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setups/hades/mc-correction-debug.yml b/setups/hades/mc-correction-debug.yml index bdcaef28..2b59aca1 100644 --- a/setups/hades/mc-correction-debug.yml +++ b/setups/hades/mc-correction-debug.yml @@ -148,8 +148,8 @@ hades_analysis: - name: gen_non_uniform_m type: track phi: sim_tracks/phi - weight: m - norm: none + weight: Ones + norm: m axes: - *axis_gen_pT_non_uniform - *axis_gen_rapidity @@ -180,8 +180,8 @@ hades_analysis: - name: gen_uniform_m type: track phi: sim_tracks/phi - weight: m - norm: none + weight: Ones + norm: m axes: - *axis_gen_pT_uniform - *axis_gen_rapidity From 83edbf9718ade63fda27fee4c0637713cbb02abf Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 19 Mar 2021 14:05:20 +0300 Subject: [PATCH 093/274] Without efficiency --- setups/hades/mc-correction-debug.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setups/hades/mc-correction-debug.yml b/setups/hades/mc-correction-debug.yml index 2b59aca1..7e5a0a70 100644 --- a/setups/hades/mc-correction-debug.yml +++ b/setups/hades/mc-correction-debug.yml @@ -48,7 +48,7 @@ hades_analysis: - name: rec_non_uniform_none type: track phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + weight: Ones norm: none corrections: - recentering @@ -69,7 +69,7 @@ hades_analysis: - name: rec_non_uniform_m type: track phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + weight: Ones norm: m corrections: - recentering @@ -90,7 +90,7 @@ hades_analysis: - name: rec_uniform_none type: track phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + weight: Ones norm: none corrections: - recentering @@ -111,7 +111,7 @@ hades_analysis: - name: rec_uniform_m type: track phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + weight: Ones norm: m corrections: - recentering From ba6089859561944825876c9af9fbda9a535b81b6 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 22 Mar 2021 21:31:23 +0300 Subject: [PATCH 094/274] according to the new pre-task --- setups/hades/mc-correction-auau-123.yml | 120 +++++++----------------- setups/hades/mc-correlation.yml | 8 -- 2 files changed, 33 insertions(+), 95 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 71609ccf..2e41ce72 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -2,63 +2,51 @@ _layouts: _axes: - &axis_protons_pT - name: mdc_vtx_tracks_rapidity/pT + name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - - &axis_pions_pT - name: mdc_vtx_tracks_rapidity/pT - bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_gen_protons_pT - name: sim_tracks/pT + name: sim_particles_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_gen_pions_pT - name: sim_tracks/pT + name: sim_particles_extra/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_protons_rapidity - name: mdc_vtx_tracks_rapidity/rapidity + name: mdc_vtx_tracks_extra/rapidity nb: 15 lo: -0.01 hi: 1.49 - - &axis_pions_rapidity - name: mdc_vtx_tracks_rapidity/rapidity - nb: 17 - lo: 0.09 - hi: 1.79 - &axis_gen_protons_rapidity - name: sim_tracks/rapidity + name: sim_particles_extra/rapidity nb: 15 lo: -0.01 hi: 1.49 - &axis_gen_pions_rapidity - name: sim_tracks/rapidity + name: sim_particles_extra/rapidity nb: 17 lo: 0.09 hi: 1.79 _cuts: - &pid_protons_cut - mdc_vtx_tracks_rapidity/pid: { equals: 2212 } - - &pid_pi_plus_cut - mdc_vtx_tracks_rapidity/pid: { equals: 211 } - - &pid_pi_minus_cut - mdc_vtx_tracks_rapidity/pid: { equals: -211 } + mdc_vtx_tracks_extra/pid: { equals: 2212 } - &mf_cuts - mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_rapidity/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} - &mb_cuts - mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_rapidity/rapidity: {range: [0.19, 0.39]} + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} - &gen_prim_protons_cut - sim_tracks/pid: { equals: 2212 } - sim_tracks/is_primary: { equals: 1 } + sim_particles_extra/pid: { equals: 2212 } + sim_particles_extra/is_primary: { equals: 1 } - &gen_prim_pi_plus_cut - sim_tracks/pid: { equals: 211 } - sim_tracks/is_primary: { equals: 1 } + sim_particles_extra/pid: { equals: 211 } + sim_particles_extra/is_primary: { equals: 1 } - &gen_prim_pi_minus_cut - sim_tracks/pid: { equals: -211 } - sim_tracks/is_primary: { equals: 1 } + sim_particles_extra/pid: { equals: -211 } + sim_particles_extra/is_primary: { equals: 1 } - &good_track_cuts - mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - &w1_cuts reconstructed_forward_wall_hits/ring: { range: [1.0, 5.0] } reconstructed_forward_wall_hits/signal: { range: [80.0, 999.0] } @@ -78,8 +66,8 @@ hades_analysis: ########################################################################### - name: pid_protons type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering @@ -92,56 +80,14 @@ hades_analysis: cuts-quality: *good_track_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] - ########################################################################### - - name: pid_pi_plus - type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: ones - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_pions_pT - - *axis_pions_rapidity - cuts-pid: - *pid_pi_plus_cut - cuts-quality: - *good_track_cuts - qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pions_pT - - *axis_pions_rapidity - - [*axis_pions_rapidity, *axis_pions_pT] - ########################################################################### - - name: pid_pi_minus - type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: ones - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_pions_pT - - *axis_pions_rapidity - cuts-pid: - *pid_pi_minus_cut - cuts-quality: - *good_track_cuts - qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pions_pT - - *axis_pions_rapidity - - [*axis_pions_rapidity, *axis_pions_pT] ########################################################################### - name: Mf type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -154,11 +100,11 @@ hades_analysis: cuts-pid: *pid_protons_cut qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: Mb type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -171,11 +117,11 @@ hades_analysis: cuts-pid: *pid_protons_cut qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: gen_prim_protons type: track - phi: sim_tracks/phi + phi: sim_particles_extra/phi weight: Ones norm: m axes: @@ -184,14 +130,14 @@ hades_analysis: cuts-pid: *gen_prim_protons_cut qa: - - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT - *axis_gen_protons_rapidity - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] ########################################################################### - name: gen_prim_pi_plus type: track - phi: sim_tracks/phi + phi: sim_particles_extra/phi weight: Ones norm: m axes: @@ -200,14 +146,14 @@ hades_analysis: cuts-pid: *gen_prim_pi_plus_cut qa: - - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_pions_pT - *axis_gen_pions_rapidity - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] ########################################################################### - name: gen_prim_pi_minus type: track - phi: sim_tracks/phi + phi: sim_particles_extra/phi weight: Ones norm: m axes: @@ -216,7 +162,7 @@ hades_analysis: cuts-pid: *gen_prim_pi_minus_cut qa: - - {name: sim_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_pions_pT - *axis_gen_pions_rapidity - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index a10d9836..ab4e23ec 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -1,16 +1,8 @@ _detectors: &detectors - name: pid_protons tags: [ un_vector ] - - name: pid_pi_plus - tags: [ un_vector ] - - name: pid_pi_minus - tags: [ un_vector ] - name: gen_prim_protons tags: [ gen_un_vector ] - - name: gen_prim_pi_plus - tags: [ gen_un_vector ] - - name: gen_prim_pi_minus - tags: [ gen_un_vector ] - name: psi_rp tags: [ psi_vector ] - name: W1 From 0fb849c6eaceedac529a0c1d52ff422a2293ea92 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 23 Mar 2021 18:47:31 +0300 Subject: [PATCH 095/274] fix --- setups/hades/mc-correction-auau-123.yml | 54 ++----------------------- 1 file changed, 4 insertions(+), 50 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 2e41ce72..99c9a070 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -7,24 +7,16 @@ _axes: - &axis_gen_protons_pT name: sim_particles_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - - &axis_gen_pions_pT - name: sim_particles_extra/pT - bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/rapidity nb: 15 - lo: -0.01 - hi: 1.49 + lo: -0.75 + hi: 0.75 - &axis_gen_protons_rapidity name: sim_particles_extra/rapidity nb: 15 - lo: -0.01 - hi: 1.49 - - &axis_gen_pions_rapidity - name: sim_particles_extra/rapidity - nb: 17 - lo: 0.09 - hi: 1.79 + lo: -0.75 + hi: 0.75 _cuts: - &pid_protons_cut mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -37,12 +29,6 @@ _cuts: - &gen_prim_protons_cut sim_particles_extra/pid: { equals: 2212 } sim_particles_extra/is_primary: { equals: 1 } - - &gen_prim_pi_plus_cut - sim_particles_extra/pid: { equals: 211 } - sim_particles_extra/is_primary: { equals: 1 } - - &gen_prim_pi_minus_cut - sim_particles_extra/pid: { equals: -211 } - sim_particles_extra/is_primary: { equals: 1 } - &good_track_cuts mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} @@ -134,38 +120,6 @@ hades_analysis: - *axis_gen_protons_pT - *axis_gen_protons_rapidity - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] - ########################################################################### - - name: gen_prim_pi_plus - type: track - phi: sim_particles_extra/phi - weight: Ones - norm: m - axes: - - *axis_gen_pions_pT - - *axis_gen_pions_rapidity - cuts-pid: - *gen_prim_pi_plus_cut - qa: - - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_gen_pions_pT - - *axis_gen_pions_rapidity - - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] - ########################################################################### - - name: gen_prim_pi_minus - type: track - phi: sim_particles_extra/phi - weight: Ones - norm: m - axes: - - *axis_gen_pions_pT - - *axis_gen_pions_rapidity - cuts-pid: - *gen_prim_pi_minus_cut - qa: - - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_gen_pions_pT - - *axis_gen_pions_rapidity - - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] ########################################################################### - name: W1 type: track From a2af16efd904a1d011cb38020bbd4152d4e16a95 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 23 Mar 2021 18:49:36 +0300 Subject: [PATCH 096/274] according to the new pre-processing --- setups/hades/mc-correction-auau-123-all.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index ef8a3b67..298fb303 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -2,21 +2,21 @@ _layouts: _axes: - &axis_gen_protons_pT - name: sim_tracks_rapidity/pT + name: sim_particles_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_gen_pions_pT - name: sim_tracks_rapidity/pT + name: sim_particles_extra/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_gen_pions_rapidity - name: sim_tracks_rapidity/pions_rapidity + name: sim_particles_extra/pions_rapidity nb: 17 lo: 0.09 hi: 1.79 - &axis_gen_protons_rapidity - name: sim_tracks_rapidity/protons_rapidity + name: sim_particles_extra/protons_rapidity nb: 15 - lo: -0.01 - hi: 1.49 + lo: -0.75 + hi: 0.75 hades_analysis: event-variables: @@ -27,13 +27,13 @@ hades_analysis: ########################################################################### - name: protons type: track - phi: sim_tracks_rapidity/phi + phi: sim_particles_extra/phi weight: Ones axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity qa: - - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT - *axis_gen_protons_rapidity - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] @@ -41,13 +41,13 @@ hades_analysis: ########################################################################### - name: pions type: track - phi: sim_tracks_rapidity/phi + phi: sim_particles_extra/phi weight: Ones axes: - *axis_gen_pions_pT - *axis_gen_pions_rapidity qa: - - {name: sim_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_pions_pT - *axis_gen_pions_rapidity - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] From 72d30b9f43bdf495adad295302ab1df6ccc6250d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 25 Mar 2021 15:02:45 +0300 Subject: [PATCH 097/274] fixing ycm axis --- setups/hades/mc-correction-auau-123.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 99c9a070..a0753855 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -8,12 +8,12 @@ _axes: name: sim_particles_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_protons_rapidity - name: mdc_vtx_tracks_extra/rapidity + name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 - &axis_gen_protons_rapidity - name: sim_particles_extra/rapidity + name: sim_particles_extra/ycm nb: 15 lo: -0.75 hi: 0.75 From f3c545f7a3e89abd831100d665f4fcbf2c791a59 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 4 Apr 2021 22:51:57 +0300 Subject: [PATCH 098/274] New correction setup for MC Ag+Ag@1.58A GeV --- setups/hades/mc-correction-agag-158.yml | 172 ++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 setups/hades/mc-correction-agag-158.yml diff --git a/setups/hades/mc-correction-agag-158.yml b/setups/hades/mc-correction-agag-158.yml new file mode 100644 index 00000000..89c0b753 --- /dev/null +++ b/setups/hades/mc-correction-agag-158.yml @@ -0,0 +1,172 @@ +_layouts: + +_axes: + - &axis_protons_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_gen_protons_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_protons_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_gen_protons_rapidity + name: sim_particles_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 +_cuts: + - &pid_protons_cut + mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &mf_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} + - &mb_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} + - &gen_prim_protons_cut + sim_particles_extra/pid: { equals: 2212 } + sim_particles_extra/is_primary: { equals: 1 } + - &good_track_cuts + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/time: { range: [22.681788, 27.002128] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/time: { range: [22.681788, 26.684456] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: + ########################################################################### + - name: pid_protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_protons_pT + - *axis_protons_rapidity + cuts-pid: + *pid_protons_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_protons_pT + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] + ########################################################################### + - name: Mf + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mf_cuts + cuts-quality: + *good_track_cuts + cuts-pid: + *pid_protons_cut + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: Mb + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mb_cuts + cuts-quality: + *good_track_cuts + cuts-pid: + *pid_protons_cut + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: gen_prim_protons + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + cuts-pid: + *gen_prim_protons_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + ########################################################################### + - name: W1 + type: track + phi: reconstructed_forward_wall_hits/phi + weight: reconstructed_forward_wall_hits/signal + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-w1: + *w1_cuts + qa: + - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + ########################################################################### + - name: W2 + type: track + phi: reconstructed_forward_wall_hits/phi + weight: reconstructed_forward_wall_hits/signal + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-w2: + *w2_cuts + qa: + - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + ########################################################################### + - name: W3 + type: track + phi: reconstructed_forward_wall_hits/phi + weight: reconstructed_forward_wall_hits/signal + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-w3: + *w3_cuts + qa: + - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + ########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag +# qa: +# - {name: sim_header/reaction_plane, nb: 320, lo: -3.2, hi: 3.2} \ No newline at end of file From 4933ec4ed0a9d2fe625ff018e31b3743bb3c0c50 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 6 Apr 2021 15:13:43 +0300 Subject: [PATCH 099/274] Branch names and fields changed according to a new pre-processing --- setups/hades/correction-auau-123-all.yml | 63 +++++++++--------------- 1 file changed, 22 insertions(+), 41 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 673a5ec1..4003a0f3 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -2,34 +2,34 @@ _layouts: _axes: - &axis_protons_pT - name: mdc_vtx_tracks_rapidity/pT + name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_pions_pT - name: mdc_vtx_tracks_rapidity/pT + name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_protons_rapidity - name: mdc_vtx_tracks_rapidity/protons_rapidity + name: mdc_vtx_tracks_extra/protons_rapidity nb: 15 - lo: -0.01 - hi: 1.49 + lo: -0.75 + hi: 0.75 - &axis_pions_rapidity - name: mdc_vtx_tracks_rapidity/pions_rapidity + name: mdc_vtx_tracks_extra/pions_rapidity nb: 17 lo: 0.09 hi: 1.79 _cuts: - &protons_cuts - mdc_vtx_tracks/pid: { equals: 2212 } + mdc_vtx_tracks_extra/pid: { equals: 2212 } - &good_particle_cuts - mdc_vtx_tracks/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - &mf_cuts - mdc_vtx_tracks/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} - &mb_cuts - mdc_vtx_tracks/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks/rapidity: {range: [0.19, 0.39]} + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} - &r1_cuts forward_wall_hits/rnd_sub: { equals: 0 } forward_wall_hits/time: { range: [22.681788, 28.352235] } @@ -60,8 +60,8 @@ hades_analysis: ############################################################# - name: protons type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering @@ -70,35 +70,16 @@ hades_analysis: - *axis_protons_pT - *axis_protons_rapidity cuts: - mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_extra_rapidity/chi2: {range: [0.0, 100.0]} qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# - - name: pions - type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_pions_pT - - *axis_pions_rapidity - cuts: - mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} - qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pions_pT - - *axis_pions_rapidity - - [*axis_pions_rapidity, *axis_pions_pT] - ############################################################# - name: Mf type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -111,11 +92,11 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: Mb type: track - phi: mdc_vtx_tracks/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -128,7 +109,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: R1 type: track From 79a5355a42e64ff9bc00b7da0a7347f95af928a4 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 6 Apr 2021 16:35:39 +0300 Subject: [PATCH 100/274] Branch fixed --- setups/hades/correction-auau-123-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 4003a0f3..7931981d 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -70,7 +70,7 @@ hades_analysis: - *axis_protons_pT - *axis_protons_rapidity cuts: - mdc_vtx_tracks_extra_rapidity/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT From 58a0c95b1c1c01efcaeceb05a4e09124dcba211d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 7 Apr 2021 15:10:55 +0300 Subject: [PATCH 101/274] pions excluded --- setups/hades/correlation-all.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/setups/hades/correlation-all.yml b/setups/hades/correlation-all.yml index 62fde8db..dde14398 100644 --- a/setups/hades/correlation-all.yml +++ b/setups/hades/correlation-all.yml @@ -1,8 +1,6 @@ _detectors: &detectors - name: protons tags: [ un_vector ] - - name: pions - tags: [ un_vector ] - name: W1 tags: [ qn_vector ] - name: W2 From 9e1b00751164d72d58f337bdbab53548fff77bf1 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 7 Apr 2021 23:46:09 +0300 Subject: [PATCH 102/274] only necessary vectors are kept --- setups/hades/correction-auau-123-all.yml | 44 +++--- setups/hades/correlation-all.yml | 172 +++++++++++------------ 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 7931981d..c0a23258 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -61,7 +61,7 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency + weight: none norm: m corrections: - recentering @@ -111,27 +111,27 @@ hades_analysis: qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - - name: R1 - type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal - norm: m - corrections: - - recentering - - twist-and-rescale - cuts: - *r1_cuts - ############################################################# - - name: R2 - type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal - norm: m - corrections: - - recentering - - twist-and-rescale - cuts: - *r2_cuts +# - name: R1 +# type: track +# phi: forward_wall_hits/phi +# weight: forward_wall_hits/signal +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts: +# *r1_cuts +# ############################################################# +# - name: R2 +# type: track +# phi: forward_wall_hits/phi +# weight: forward_wall_hits/signal +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts: +# *r2_cuts ############################################################# - name: W1 type: track diff --git a/setups/hades/correlation-all.yml b/setups/hades/correlation-all.yml index dde14398..9313c8fa 100644 --- a/setups/hades/correlation-all.yml +++ b/setups/hades/correlation-all.yml @@ -43,53 +43,53 @@ _tasks: weight: ones n-samples: 100 weights-type: observable - folder: "/uQ/SP" - axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: ones - n-samples: 100 - weights-type: observable - folder: "/uQ/SP" - axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *ep_components # - correction-steps: [ rescaled ] - weight: ones - n-samples: 100 - weights-type: observable - folder: "/uQ/EP" - axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *ep_components # - correction-steps: [ rescaled ] - weight: ones - n-samples: 100 - weights-type: observable - folder: "/uQ/EP" + folder: "/SP/uQ" axes: [ *centrality ] +# - args: +# - query: { tags: { any-in: [ un_vector ] } } +# query-list: *detectors +# components: *sp_components +# correction-steps: [ rescaled ] +# weight: sumw +# - query: { tags: { any-in: [ rnd_vector ] } } +# query-list: *detectors +# components: *sp_components +# correction-steps: [ rescaled ] +# weight: ones +# n-samples: 100 +# weights-type: observable +# folder: "/uQ/SP" +# axes: [ *centrality ] +# - args: +# - query: { tags: { any-in: [ un_vector ] } } +# query-list: *detectors +# components: *sp_components +# correction-steps: [ rescaled ] +# weight: sumw +# - query: { tags: { any-in: [ qn_vector ] } } +# query-list: *detectors +# components: *ep_components # +# correction-steps: [ rescaled ] +# weight: ones +# n-samples: 100 +# weights-type: observable +# folder: "/uQ/EP" +# axes: [ *centrality ] +# - args: +# - query: { tags: { any-in: [ un_vector ] } } +# query-list: *detectors +# components: *sp_components +# correction-steps: [ rescaled ] +# weight: sumw +# - query: { tags: { any-in: [ rnd_vector ] } } +# query-list: *detectors +# components: *ep_components # +# correction-steps: [ rescaled ] +# weight: ones +# n-samples: 100 +# weights-type: observable +# folder: "/uQ/EP" +# axes: [ *centrality ] # Reference x Reference - args: - query: { tags: { any-in: [ qn_vector ] } } @@ -102,44 +102,44 @@ _tasks: correction-steps: [ rescaled ] n-samples: 100 weights-type: reference - folder: "/QQ/SP" - axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - n-samples: 100 - weights-type: reference - folder: "/QQ/SP" - axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] - n-samples: 100 - weights-type: reference - folder: "/QQ/EP" + folder: "/SP/QQ" axes: [ *centrality ] - - args: - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ rnd_vector ] } } - query-list: *detectors - components: *ep_components - correction-steps: [ rescaled ] - n-samples: 100 - weights-type: reference - folder: "/QQ/EP" - axes: [ *centrality ] \ No newline at end of file +# - args: +# - query: { tags: { any-in: [ rnd_vector ] } } +# query-list: *detectors +# components: *sp_components +# correction-steps: [ rescaled ] +# - query: { tags: { any-in: [ rnd_vector ] } } +# query-list: *detectors +# components: *sp_components +# correction-steps: [ rescaled ] +# n-samples: 100 +# weights-type: reference +# folder: "/QQ/SP" +# axes: [ *centrality ] +# - args: +# - query: { tags: { any-in: [ qn_vector ] } } +# query-list: *detectors +# components: *ep_components +# correction-steps: [ rescaled ] +# - query: { tags: { any-in: [ qn_vector ] } } +# query-list: *detectors +# components: *ep_components +# correction-steps: [ rescaled ] +# n-samples: 100 +# weights-type: reference +# folder: "/QQ/EP" +# axes: [ *centrality ] +# - args: +# - query: { tags: { any-in: [ rnd_vector ] } } +# query-list: *detectors +# components: *ep_components +# correction-steps: [ rescaled ] +# - query: { tags: { any-in: [ rnd_vector ] } } +# query-list: *detectors +# components: *ep_components +# correction-steps: [ rescaled ] +# n-samples: 100 +# weights-type: reference +# folder: "/QQ/EP" +# axes: [ *centrality ] \ No newline at end of file From ade079be0908757890a962f5e2d24cecbcea5219 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 8 Apr 2021 00:26:41 +0300 Subject: [PATCH 103/274] Bug fixed --- setups/hades/correction-auau-123-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index c0a23258..7d4fefc5 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -61,7 +61,7 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_extra/phi - weight: none + weight: Ones norm: m corrections: - recentering From baf3bdb8f4dc8fd31091633c49e4506f3d19ec53 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 9 Apr 2021 18:52:41 +0300 Subject: [PATCH 104/274] Only charged particles for flow of all particles --- setups/hades/mc-correction-auau-123-all.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 298fb303..a3c31262 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -29,6 +29,8 @@ hades_analysis: type: track phi: sim_particles_extra/phi weight: Ones + cuts: + sim_particles_extra/is_chrged: {equals: 1} axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity @@ -43,6 +45,8 @@ hades_analysis: type: track phi: sim_particles_extra/phi weight: Ones + cuts: + sim_particles_extra/is_chrged: {equals: 1} axes: - *axis_gen_pions_pT - *axis_gen_pions_rapidity From e079f7f80aa14cf54523a9ec8c2bdeb4d406efdd Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 9 Apr 2021 21:35:19 +0300 Subject: [PATCH 105/274] Fix --- setups/hades/au123-correction-debug.yml | 154 ++++++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 setups/hades/au123-correction-debug.yml diff --git a/setups/hades/au123-correction-debug.yml b/setups/hades/au123-correction-debug.yml new file mode 100644 index 00000000..588a50a0 --- /dev/null +++ b/setups/hades/au123-correction-debug.yml @@ -0,0 +1,154 @@ +_layouts: + +_axes: + - &axis_rapidity + name: mdc_vtx_tracks_rapidity/rapidity + nb: 30 + lo: -0.01 + hi: 1.49 + - &axis_pT_non_uniform + name: mdc_vtx_tracks_rapidity/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_pT_uniform + name: mdc_vtx_tracks_rapidity/pT + nb: 16 + lo: 0.0 + hi: 1.6 +_cuts: + - &pid_protons_cut + mdc_vtx_tracks_rapidity/pid: { equals: 2212 } + - &good_track_cuts + mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: + ########################################################################### + - name: non_uniform_none + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: Ones + norm: none + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT_non_uniform + - *axis_rapidity + cuts-pid: + *pid_protons_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT_non_uniform + - *axis_rapidity + - [*axis_rapidity, *axis_pT_non_uniform] + ########################################################################### + - name: non_uniform_m + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT_non_uniform + - *axis_rapidity + cuts-pid: + *pid_protons_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT_non_uniform + - *axis_rapidity + - [*axis_rapidity, *axis_pT_non_uniform] + ########################################################################### + - name: uniform_none + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: Ones + norm: none + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT_uniform + - *axis_rapidity + cuts-pid: + *pid_protons_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT_uniform + - *axis_rapidity + - [*axis_rapidity, *axis_pT_uniform] + ########################################################################### + - name: uniform_m + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pT_uniform + - *axis_rapidity + cuts-pid: + *pid_protons_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pT_uniform + - *axis_rapidity + - [*axis_rapidity, *axis_pT_uniform] + ########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag + ############################################################# + - name: Mf + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mf_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *protons_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: Mb + type: track + phi: mdc_vtx_tracks_rapidity/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-subevent: + *mb_cuts + cuts-quality: + *good_particle_cuts + cuts-pid: + *protons_cuts + qa: + - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} From b993f1f8e4a18eb392edc1bc06205dd41127ffba Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 9 Apr 2021 21:36:15 +0300 Subject: [PATCH 106/274] Fix --- setups/hades/mc-correction-auau-123-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index a3c31262..7e03b5f5 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -30,7 +30,7 @@ hades_analysis: phi: sim_particles_extra/phi weight: Ones cuts: - sim_particles_extra/is_chrged: {equals: 1} + sim_particles_extra/is_charged: {equals: 1} axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity From 0c84cdef52d281010163b36ca70c26d0e467bd60 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 10 Apr 2021 17:32:56 +0300 Subject: [PATCH 107/274] No efficiency weight --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index a0753855..f641d185 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -53,7 +53,7 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency + weight: Ones norm: m corrections: - recentering From 39afc286886187b76fb99ae83dae830e850a8704 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 10 Apr 2021 21:19:39 +0300 Subject: [PATCH 108/274] With efficiency --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index f641d185..a0753855 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -53,7 +53,7 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering From 5cb761b7c7bc23634c0d3ec2394ffd6c9f3f5be3 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 10 Apr 2021 23:36:34 +0300 Subject: [PATCH 109/274] No eff --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index a0753855..f641d185 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -53,7 +53,7 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency + weight: Ones norm: m corrections: - recentering From a2ecc7864ecea2752d578de5ec2932c1419ec34f Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 11 Apr 2021 00:44:47 +0300 Subject: [PATCH 110/274] rapidity windows of M-vectors fixed --- setups/hades/correction-auau-123-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 7d4fefc5..f614a25a 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -26,10 +26,10 @@ _cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - &mf_cuts mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks_extra/rapidity: {range: [0.35, 0.55]} - &mb_cuts mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} + mdc_vtx_tracks_extra/rapidity: {range: [-0.55, -0.35]} - &r1_cuts forward_wall_hits/rnd_sub: { equals: 0 } forward_wall_hits/time: { range: [22.681788, 28.352235] } From 7a7a75590be8fa6f2ec7caf9b85e30bdb3bce90d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 11 Apr 2021 00:49:23 +0300 Subject: [PATCH 111/274] bugfix --- setups/hades/correction-auau-123-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index f614a25a..7d4fefc5 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -26,10 +26,10 @@ _cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - &mf_cuts mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_extra/rapidity: {range: [0.35, 0.55]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} - &mb_cuts mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_extra/rapidity: {range: [-0.55, -0.35]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} - &r1_cuts forward_wall_hits/rnd_sub: { equals: 0 } forward_wall_hits/time: { range: [22.681788, 28.352235] } From 7fb5be0739b6cc67ae9708490ec0357235613e13 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 11 Apr 2021 22:13:56 +0300 Subject: [PATCH 112/274] efficiency weighting --- setups/hades/correction-auau-123-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 7d4fefc5..acf814ca 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -61,7 +61,7 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering From adb00a9c9f513b7e7e290d1917d8f1adc45f6efa Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 12 Apr 2021 15:05:57 +0300 Subject: [PATCH 113/274] Efficiency weighting --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index f641d185..a0753855 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -53,7 +53,7 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering From c040d4932bf5a7e9b3a651e66b5b045851a8f2ba Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 17 Apr 2021 16:44:31 +0300 Subject: [PATCH 114/274] positively charged particles only are counted --- setups/hades/correction-auau-123-all.yml | 2 ++ setups/hades/mc-correction-auau-123-all.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index acf814ca..d9158da1 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -71,6 +71,8 @@ hades_analysis: - *axis_protons_rapidity cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + charge-cuts: + mdc_vtx_tracks_extra/is_positive: {equals: 1} qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 7e03b5f5..229e26c0 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -30,7 +30,7 @@ hades_analysis: phi: sim_particles_extra/phi weight: Ones cuts: - sim_particles_extra/is_charged: {equals: 1} + sim_particles_extra/is_positive: {equals: 1} axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity From bee0a423b23c3a56656d03036df7c270555babde Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 18 Apr 2021 15:56:33 +0300 Subject: [PATCH 115/274] No charge cuts --- setups/hades/correction-auau-123-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index d9158da1..e5ce20cf 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -71,8 +71,8 @@ hades_analysis: - *axis_protons_rapidity cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - charge-cuts: - mdc_vtx_tracks_extra/is_positive: {equals: 1} +# charge-cuts: +# mdc_vtx_tracks_extra/is_positive: {equals: 1} qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT From b7b38d8b90467adab747e6b6868271a5b49f35b3 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 19 Apr 2021 00:41:49 +0300 Subject: [PATCH 116/274] is in acceptance cut added --- setups/hades/mc-correction-auau-123-all.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 229e26c0..1661e83a 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -30,7 +30,8 @@ hades_analysis: phi: sim_particles_extra/phi weight: Ones cuts: - sim_particles_extra/is_positive: {equals: 1} + sim_particles_extra/is_charged: {equals: 1} + sim_particles_extra/is_in_acceptance: {equals: 1} axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity From fc10ef3dcd85c3d67b8a0733df5f191775d94698 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 19 Apr 2021 14:30:17 +0300 Subject: [PATCH 117/274] cut on efficiency of tracking for gen tracks --- setups/hades/mc-correction-auau-123.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index a0753855..5d69851a 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -115,6 +115,8 @@ hades_analysis: - *axis_gen_protons_rapidity cuts-pid: *gen_prim_protons_cut + cuts-efficiency: + sim_particles_extra/is_in_high_efficiency: { equals: 1 } qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT From d834ee4f6f955d778246eb3c078202ec738ca739 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 19 Apr 2021 21:57:09 +0300 Subject: [PATCH 118/274] is in protons acceptance cut added --- setups/hades/correction-auau-123-all.yml | 1 + setups/hades/mc-correction-auau-123-all.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index e5ce20cf..14ae4919 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -71,6 +71,7 @@ hades_analysis: - *axis_protons_rapidity cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_extra/is_in_protons_acceptance: {equals: 1} # charge-cuts: # mdc_vtx_tracks_extra/is_positive: {equals: 1} qa: diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 1661e83a..e9772fa7 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -31,7 +31,7 @@ hades_analysis: weight: Ones cuts: sim_particles_extra/is_charged: {equals: 1} - sim_particles_extra/is_in_acceptance: {equals: 1} + sim_particles_extra/is_in_protons_acceptance: {equals: 1} axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity From 5c2436f6f31a5688d68749ecc696f04c2ca0935c Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 22 Apr 2021 17:23:16 +0300 Subject: [PATCH 119/274] protons pT-axis --- setups/hades/correction-auau-123-all.yml | 2 +- setups/hades/mc-correction-auau-123-all.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 14ae4919..9b0cb17d 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -2,7 +2,7 @@ _layouts: _axes: - &axis_protons_pT - name: mdc_vtx_tracks_extra/pT + name: mdc_vtx_tracks_extra/protons_pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_pions_pT name: mdc_vtx_tracks_extra/pT diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index e9772fa7..f1bf7f9f 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -2,7 +2,7 @@ _layouts: _axes: - &axis_gen_protons_pT - name: sim_particles_extra/pT + name: sim_particles_extra/protons_pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_gen_pions_pT name: sim_particles_extra/pT From 5bb6300eb733a359b3ad4f5f6f896b3b7076daa5 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 22 Apr 2021 17:24:45 +0300 Subject: [PATCH 120/274] Cuts changed + no efficiency weighting --- setups/hades/correction-auau-123-all.yml | 5 +++-- setups/hades/mc-correction-auau-123-all.yml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 9b0cb17d..7672a62d 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -61,7 +61,8 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency +# weight: mdc_vtx_tracks_extra/efficiency + weight: Ones norm: m corrections: - recentering @@ -71,7 +72,7 @@ hades_analysis: - *axis_protons_rapidity cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - mdc_vtx_tracks_extra/is_in_protons_acceptance: {equals: 1} +# mdc_vtx_tracks_extra/is_in_protons_acceptance: {equals: 1} # charge-cuts: # mdc_vtx_tracks_extra/is_positive: {equals: 1} qa: diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index f1bf7f9f..75b10a60 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -31,7 +31,7 @@ hades_analysis: weight: Ones cuts: sim_particles_extra/is_charged: {equals: 1} - sim_particles_extra/is_in_protons_acceptance: {equals: 1} +# sim_particles_extra/is_in_protons_acceptance: {equals: 1} axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity From f976ff3df21642b5ee10ff0a44d0cd58d9fa167d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 22 Apr 2021 21:12:42 +0300 Subject: [PATCH 121/274] efficiency weighting --- setups/hades/correction-auau-123-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 7672a62d..43a0415b 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -61,8 +61,8 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_extra/phi -# weight: mdc_vtx_tracks_extra/efficiency - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency +# weight: Ones norm: m corrections: - recentering From 50c7eea0f8e6329974e44899afa85a63a0db057d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 23 Apr 2021 04:47:15 +0300 Subject: [PATCH 122/274] eta axis added --- setups/hades/correction-auau-123-all.yml | 10 ++++++++-- setups/hades/correction-auau-123.yml | 6 ++++++ setups/hades/mc-correction-auau-123-all.yml | 10 ++++++++-- setups/hades/mc-correction-auau-123.yml | 20 ++++++++++++++++---- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 43a0415b..c33d61a3 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -12,6 +12,11 @@ _axes: nb: 15 lo: -0.75 hi: 0.75 + - &axis_protons_eta + name: mdc_vtx_tracks_extra/eta + nb: 11 + lo: 0.0 + hi: 2.1 - &axis_pions_rapidity name: mdc_vtx_tracks_extra/pions_rapidity nb: 17 @@ -68,8 +73,9 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_protons_pT - - *axis_protons_rapidity +# - *axis_protons_pT +# - *axis_protons_rapidity + - *axis_protons_eta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} # mdc_vtx_tracks_extra/is_in_protons_acceptance: {equals: 1} diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index ad75bc34..fb165e76 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -17,6 +17,11 @@ _axes: nb: 15 lo: -0.75 hi: 0.75 + - &axis_protons_eta + name: mdc_vtx_tracks_rapidity/eta + nb: 11 + lo: 0.0 + hi: 2.2 - &axis_pions_rapidity name: mdc_vtx_tracks_rapidity/ycm nb: 17 @@ -78,6 +83,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity + - *axis_protons_eta cuts-pid: *protons_cuts cuts-quality: diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 75b10a60..1ee45793 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -17,6 +17,11 @@ _axes: nb: 15 lo: -0.75 hi: 0.75 + - &axis_gen_protons_eta + name: sim_particles_extra/eta + nb: 11 + lo: 0.0 + hi: 2.2 hades_analysis: event-variables: @@ -33,8 +38,9 @@ hades_analysis: sim_particles_extra/is_charged: {equals: 1} # sim_particles_extra/is_in_protons_acceptance: {equals: 1} axes: - - *axis_gen_protons_pT - - *axis_gen_protons_rapidity +# - *axis_gen_protons_pT +# - *axis_gen_protons_rapidity + - *axis_gen_protons_eta qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 5d69851a..47b22003 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -12,11 +12,21 @@ _axes: nb: 15 lo: -0.75 hi: 0.75 + - &axis_protons_eta + name: mdc_vtx_tracks_rapidity/eta + nb: 11 + lo: 0.0 + hi: 2.2 - &axis_gen_protons_rapidity name: sim_particles_extra/ycm nb: 15 lo: -0.75 hi: 0.75 + - &axis_gen_protons_eta + name: sim_particles_extra/eta + nb: 11 + lo: 0.0 + hi: 2.2 _cuts: - &pid_protons_cut mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -59,8 +69,9 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_protons_pT - - *axis_protons_rapidity +# - *axis_protons_pT +# - *axis_protons_rapidity + - *axis_protons_eta cuts-pid: *pid_protons_cut cuts-quality: @@ -111,8 +122,9 @@ hades_analysis: weight: Ones norm: m axes: - - *axis_gen_protons_pT - - *axis_gen_protons_rapidity +# - *axis_gen_protons_pT +# - *axis_gen_protons_rapidity + - *axis_gen_protons_eta cuts-pid: *gen_prim_protons_cut cuts-efficiency: From 4c723b1bb6b4206d6751d17b7b33eb4d94603ccb Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 23 Apr 2021 16:30:25 +0200 Subject: [PATCH 123/274] branch name fixed --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 47b22003..db007176 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -13,7 +13,7 @@ _axes: lo: -0.75 hi: 0.75 - &axis_protons_eta - name: mdc_vtx_tracks_rapidity/eta + name: mdc_vtx_tracks_extra/eta nb: 11 lo: 0.0 hi: 2.2 From 655adee24760eb4127e5f1af5a0fd6f4034d2512 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 24 Apr 2021 12:02:08 +0200 Subject: [PATCH 124/274] Normalization is back, rescaled u-vector and correlation step update --- setups/hades/correction-auau-123.yml | 93 ++------------------------- setups/hades/correlation-auau-123.yml | 34 +--------- 2 files changed, 6 insertions(+), 121 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index fb165e76..3ccc3a21 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -76,10 +76,10 @@ hades_analysis: type: track phi: mdc_vtx_tracks_rapidity/phi weight: mdc_vtx_tracks_rapidity/efficiency - norm: none -# corrections: -# - recentering -# - twist-and-rescale + norm: m + corrections: + - recentering + - twist-and-rescale axes: - *axis_protons_pT - *axis_protons_rapidity @@ -94,69 +94,6 @@ hades_analysis: - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# - - name: protons_uniform - type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency - norm: none -# corrections: -# - recentering -# - twist-and-rescale - axes: - - *axis_pT_uniform - - *axis_protons_rapidity - cuts-pid: - *protons_cuts - cuts-quality: - *good_particle_cuts - qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT_uniform - - *axis_protons_rapidity - - [*axis_protons_rapidity, *axis_pT_uniform] - ############################################################# -# - name: pi_plus -# type: track -# phi: mdc_vtx_tracks_rapidity/phi -# weight: Ones -# norm: m -# corrections: -# - recentering -# - twist-and-rescale -# axes: -# - *axis_pions_pT -# - *axis_pions_rapidity -# cuts-pid: -# *pion_plus_cuts -# cuts-quality: -# *good_particle_cuts -# qa: -# - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} -# - *axis_pions_pT -# - *axis_pions_rapidity -# - [*axis_pions_rapidity, *axis_pions_pT] -# ############################################################# -# - name: pi_minus -# type: track -# phi: mdc_vtx_tracks_rapidity/phi -# weight: Ones -# norm: m -# corrections: -# - recentering -# - twist-and-rescale -# axes: -# - *axis_pions_pT -# - *axis_pions_rapidity -# cuts-pid: -# *pion_minus_cuts -# cuts-quality: -# *good_particle_cuts -# qa: -# - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} -# - *axis_pions_pT -# - *axis_pions_rapidity -# - [*axis_pions_rapidity, *axis_pions_pT] - ############################################################# - name: Mf type: track phi: mdc_vtx_tracks_rapidity/phi @@ -191,28 +128,6 @@ hades_analysis: qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} ############################################################# -# - name: R1 -# type: track -# phi: forward_wall_hits/phi -# weight: forward_wall_hits/signal -# norm: m -# corrections: -# - recentering -# - twist-and-rescale -# cuts: -# *r1_cuts -# ############################################################# -# - name: R2 -# type: track -# phi: forward_wall_hits/phi -# weight: forward_wall_hits/signal -# norm: m -# corrections: -# - recentering -# - twist-and-rescale -# cuts: -# *r2_cuts - ############################################################# - name: W1 type: track phi: forward_wall_hits/phi diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index b1c771b8..cb60746b 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -1,22 +1,12 @@ _detectors: &detectors - name: protons tags: [ un_vector ] - - name: protons_uniform - tags: [ un_vector ] -# - name: pi_plus -# tags: [ un_vector ] -# - name: pi_minus -# tags: [ un_vector ] - name: W1 tags: [ qn_vector ] - name: W2 tags: [ qn_vector ] - name: W3 tags: [ qn_vector ] -# - name: R1 -# tags: [ rnd_vector ] -# - name: R2 -# tags: [ rnd_vector ] - name: Mf tags: [ qn_vector ] - name: Mb @@ -40,7 +30,7 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: sumw - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } @@ -78,16 +68,6 @@ _tasks: weights-type: observable folder: "/EP/uQ" axes: [ *centrality ] -# - args: [*ta_u, *ta_rnd_sp] -# n-samples: 100 -# weights-type: observable -# folder: "/SP/uQ" -# axes: [ *centrality ] -# - args: [*ta_u, *ta_rnd_ep] -# n-samples: 100 -# weights-type: observable -# folder: "/EP/uQ" -# axes: [ *centrality ] # Reference x Reference - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 @@ -98,14 +78,4 @@ _tasks: n-samples: 100 weights-type: reference folder: "/EP/QQ" - axes: [ *centrality ] -# - args: [*ta_rnd_sp, *ta_rnd_sp] -# n-samples: 100 -# weights-type: reference -# folder: "/SP/QQ" -# axes: [ *centrality ] -# - args: [*ta_rnd_ep, *ta_rnd_ep] -# n-samples: 100 -# weights-type: reference -# folder: "/EP/QQ" -# axes: [ *centrality ] \ No newline at end of file + axes: [ *centrality ] \ No newline at end of file From 1a63c909fe1a324d84dfdcbafd314b8f9230a165 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 26 Apr 2021 17:43:51 +0200 Subject: [PATCH 125/274] 44 bins along eta axis --- setups/hades/correction-auau-123-all.yml | 2 +- setups/hades/correction-auau-123.yml | 8 ++++---- setups/hades/correlation-auau-123.yml | 2 +- setups/hades/mc-correction-auau-123-all.yml | 2 +- setups/hades/mc-correction-auau-123.yml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index c33d61a3..99cbccf5 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -14,7 +14,7 @@ _axes: hi: 0.75 - &axis_protons_eta name: mdc_vtx_tracks_extra/eta - nb: 11 + nb: 44 lo: 0.0 hi: 2.1 - &axis_pions_rapidity diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 3ccc3a21..f79e9f30 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -19,7 +19,7 @@ _axes: hi: 0.75 - &axis_protons_eta name: mdc_vtx_tracks_rapidity/eta - nb: 11 + nb: 44 lo: 0.0 hi: 2.2 - &axis_pions_rapidity @@ -77,9 +77,9 @@ hades_analysis: phi: mdc_vtx_tracks_rapidity/phi weight: mdc_vtx_tracks_rapidity/efficiency norm: m - corrections: - - recentering - - twist-and-rescale +# corrections: +# - recentering +# - twist-and-rescale axes: - *axis_protons_pT - *axis_protons_rapidity diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index cb60746b..9d703426 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -30,7 +30,7 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 1ee45793..994edbca 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -19,7 +19,7 @@ _axes: hi: 0.75 - &axis_gen_protons_eta name: sim_particles_extra/eta - nb: 11 + nb: 44 lo: 0.0 hi: 2.2 diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index db007176..95eca5bb 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -14,7 +14,7 @@ _axes: hi: 0.75 - &axis_protons_eta name: mdc_vtx_tracks_extra/eta - nb: 11 + nb: 44 lo: 0.0 hi: 2.2 - &axis_gen_protons_rapidity @@ -24,7 +24,7 @@ _axes: hi: 0.75 - &axis_gen_protons_eta name: sim_particles_extra/eta - nb: 11 + nb: 44 lo: 0.0 hi: 2.2 _cuts: From 7694d45337a6135c15ab8a1a61797b73c35a20c3 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 27 Apr 2021 16:12:04 +0200 Subject: [PATCH 126/274] Number of bins reduced --- setups/hades/correction-auau-123.yml | 4 ++-- setups/hades/correlation-auau-123.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index f79e9f30..12b10a9d 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -14,7 +14,7 @@ _axes: bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_protons_rapidity name: mdc_vtx_tracks_rapidity/ycm - nb: 15 + nb: 5 lo: -0.75 hi: 0.75 - &axis_protons_eta @@ -69,7 +69,7 @@ hades_analysis: event-variables: - event_header/selected_tof_rpc_hits_centrality axes: - - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 6, lo: 0.0, hi: 60 } q-vectors: ############################################################# - name: protons diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 9d703426..d60f8580 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -15,7 +15,7 @@ _detectors: &detectors _axes: - ¢rality name: event_header_selected_tof_rpc_hits_centrality - nb: 12 + nb: 6 lo: 0 hi: 60 From 2e813b376068547f671524151bc1c0eae315732b Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 28 Apr 2021 21:49:06 +0200 Subject: [PATCH 127/274] is in acceptance cut --- setups/hades/mc-correction-auau-123-all.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 994edbca..2708b3f3 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -36,11 +36,11 @@ hades_analysis: weight: Ones cuts: sim_particles_extra/is_charged: {equals: 1} -# sim_particles_extra/is_in_protons_acceptance: {equals: 1} + sim_particles_extra/is_in_protons_acceptance: {equals: 1} axes: -# - *axis_gen_protons_pT -# - *axis_gen_protons_rapidity - - *axis_gen_protons_eta + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity +# - *axis_gen_protons_eta qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT From 429adc0b065843928d72314f3c8af2b99d08223e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 28 Apr 2021 23:13:24 +0200 Subject: [PATCH 128/274] Back to pT-rapidity flow --- setups/hades/correction-auau-123-all.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 99cbccf5..61fa4e45 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -73,12 +73,12 @@ hades_analysis: - recentering - twist-and-rescale axes: -# - *axis_protons_pT -# - *axis_protons_rapidity - - *axis_protons_eta + - *axis_protons_pT + - *axis_protons_rapidity +# - *axis_protons_eta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} -# mdc_vtx_tracks_extra/is_in_protons_acceptance: {equals: 1} + mdc_vtx_tracks_extra/is_in_protons_acceptance: {equals: 1} # charge-cuts: # mdc_vtx_tracks_extra/is_positive: {equals: 1} qa: From 1af1f7d0ecde8cae3f735386efdf93e564c39365 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 29 Apr 2021 16:39:33 +0200 Subject: [PATCH 129/274] v1 even setup is ready --- setups/hades/mc-correction-auau-123-even.yml | 82 ++++++++++++++++++++ setups/hades/mc-correlation-even.yml | 50 ++++++++++++ 2 files changed, 132 insertions(+) create mode 100644 setups/hades/mc-correction-auau-123-even.yml create mode 100644 setups/hades/mc-correlation-even.yml diff --git a/setups/hades/mc-correction-auau-123-even.yml b/setups/hades/mc-correction-auau-123-even.yml new file mode 100644 index 00000000..4907cad5 --- /dev/null +++ b/setups/hades/mc-correction-auau-123-even.yml @@ -0,0 +1,82 @@ +_layouts: + +_axes: + - &axis_protons_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_gen_protons_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_protons_rapidity + name: mdc_vtx_tracks_extra/abs_ycm + nb: 7 + lo: 0.05 + hi: 0.75 + - &axis_gen_protons_rapidity + name: sim_particles_extra/abs_ycm + nb: 7 + lo: 0.05 + hi: 0.75 + +_cuts: + - &pid_protons_cut + mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &gen_prim_protons_cut + sim_particles_extra/pid: { equals: 2212 } + sim_particles_extra/is_primary: { equals: 1 } + - &good_track_cuts + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: + ########################################################################### + - name: pid_protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_protons_pT + - *axis_protons_rapidity + cuts-pid: + *pid_protons_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_protons_pT + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] + ############################################################# + - name: gen_prim_protons + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + cuts-pid: + *gen_prim_protons_cut + cuts-efficiency: + sim_particles_extra/is_in_high_efficiency: { equals: 1 } + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + ########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag \ No newline at end of file diff --git a/setups/hades/mc-correlation-even.yml b/setups/hades/mc-correlation-even.yml new file mode 100644 index 00000000..9621f3a3 --- /dev/null +++ b/setups/hades/mc-correlation-even.yml @@ -0,0 +1,50 @@ +_detectors: &detectors + - name: pid_protons + tags: [ un_vector ] + - name: gen_prim_protons + tags: [ gen_un_vector ] + - name: psi_rp + tags: [ psi_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + +_tasks_args: + - &ta_reco + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_sim + query: { tags: { any-in: [ gen_un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_reco, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/uQ/reco" + axes: [ *centrality ] + - args: [*ta_sim, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/uQ/gen" + axes: [ *centrality ] \ No newline at end of file From 8a887dcc08e69d31e6151b3d6cbe4d67bfd90ff2 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 3 May 2021 16:09:20 +0200 Subject: [PATCH 130/274] pt-rapidity flow + cut on theta --- setups/hades/correction-auau-123-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 61fa4e45..539a9dc0 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -78,7 +78,7 @@ hades_analysis: # - *axis_protons_eta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - mdc_vtx_tracks_extra/is_in_protons_acceptance: {equals: 1} +# mdc_vtx_tracks_extra/is_in_protons_acceptance: {equals: 1} # charge-cuts: # mdc_vtx_tracks_extra/is_positive: {equals: 1} qa: From 2619b4f25206f686c020f3b1e7826725d72d20b2 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 3 May 2021 21:37:30 +0200 Subject: [PATCH 131/274] pt-rapidity flow + cut on theta --- setups/hades/mc-correction-auau-123.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 95eca5bb..96b2a3c7 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -69,9 +69,9 @@ hades_analysis: - recentering - twist-and-rescale axes: -# - *axis_protons_pT -# - *axis_protons_rapidity - - *axis_protons_eta + - *axis_protons_pT + - *axis_protons_rapidity +# - *axis_protons_eta cuts-pid: *pid_protons_cut cuts-quality: @@ -122,13 +122,13 @@ hades_analysis: weight: Ones norm: m axes: -# - *axis_gen_protons_pT -# - *axis_gen_protons_rapidity - - *axis_gen_protons_eta + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity +# - *axis_gen_protons_eta cuts-pid: *gen_prim_protons_cut cuts-efficiency: - sim_particles_extra/is_in_high_efficiency: { equals: 1 } + sim_particles_extra/theta: { range: [0.3, 1.6] } qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT From cbc9a4eedd9981ec8adccd679df73e3b60cbf92c Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 4 May 2021 11:22:26 +0200 Subject: [PATCH 132/274] is in acceptance cut --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 96b2a3c7..e045bf8c 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -128,7 +128,7 @@ hades_analysis: cuts-pid: *gen_prim_protons_cut cuts-efficiency: - sim_particles_extra/theta: { range: [0.3, 1.6] } + sim_particles_extra/is_in_acceptance: { equals: 1 } qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT From 9120bb6983ba32839bc9875da1ba8c00a9c145f3 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 4 May 2021 22:33:46 +0200 Subject: [PATCH 133/274] pT axis from 0.2 to 1.5 GeV/c, non-uniform binning In Au+Au back to usual axes --- setups/hades/correction-agag-123.yml | 2 +- setups/hades/correction-agag-158.yml | 2 +- setups/hades/correction-auau-123.yml | 14 +++++++------- setups/hades/correlation-auau-123.yml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 5cb987c3..5cb572d6 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -3,7 +3,7 @@ _layouts: _axes: - &axis_pT name: mdc_vtx_tracks_rapidity/pT - bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - &axis_pT_uniform name: mdc_vtx_tracks_rapidity/pT nb: 16 diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index 0584f01f..7ffa5c9f 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -3,7 +3,7 @@ _layouts: _axes: - &axis_pT name: mdc_vtx_tracks_rapidity/pT - bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - &axis_pT_uniform name: mdc_vtx_tracks_rapidity/pT nb: 16 diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 12b10a9d..f95742ab 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -3,7 +3,7 @@ _layouts: _axes: - &axis_protons_pT name: mdc_vtx_tracks_rapidity/pT - bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - &axis_pT_uniform name: mdc_vtx_tracks_rapidity/pT nb: 16 @@ -14,7 +14,7 @@ _axes: bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_protons_rapidity name: mdc_vtx_tracks_rapidity/ycm - nb: 5 + nb: 15 lo: -0.75 hi: 0.75 - &axis_protons_eta @@ -69,7 +69,7 @@ hades_analysis: event-variables: - event_header/selected_tof_rpc_hits_centrality axes: - - { name: event_header/selected_tof_rpc_hits_centrality, nb: 6, lo: 0.0, hi: 60 } + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: ############################################################# - name: protons @@ -77,13 +77,13 @@ hades_analysis: phi: mdc_vtx_tracks_rapidity/phi weight: mdc_vtx_tracks_rapidity/efficiency norm: m -# corrections: -# - recentering -# - twist-and-rescale + corrections: + - recentering + - twist-and-rescale axes: - *axis_protons_pT - *axis_protons_rapidity - - *axis_protons_eta +# - *axis_protons_eta cuts-pid: *protons_cuts cuts-quality: diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index d60f8580..9d703426 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -15,7 +15,7 @@ _detectors: &detectors _axes: - ¢rality name: event_header_selected_tof_rpc_hits_centrality - nb: 6 + nb: 12 lo: 0 hi: 60 From 08e34d84467920c9ef9f9695a0367ea284a8f51f Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 4 May 2021 22:55:17 +0200 Subject: [PATCH 134/274] Rollback --- setups/hades/correction-auau-123-all.yml | 50 +----------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 539a9dc0..29f88d01 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -2,26 +2,13 @@ _layouts: _axes: - &axis_protons_pT - name: mdc_vtx_tracks_extra/protons_pT - bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - - &axis_pions_pT name: mdc_vtx_tracks_extra/pT - bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/protons_rapidity nb: 15 lo: -0.75 hi: 0.75 - - &axis_protons_eta - name: mdc_vtx_tracks_extra/eta - nb: 44 - lo: 0.0 - hi: 2.1 - - &axis_pions_rapidity - name: mdc_vtx_tracks_extra/pions_rapidity - nb: 17 - lo: 0.09 - hi: 1.79 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -35,14 +22,6 @@ _cuts: - &mb_cuts mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} - - &r1_cuts - forward_wall_hits/rnd_sub: { equals: 0 } - forward_wall_hits/time: { range: [22.681788, 28.352235] } - forward_wall_hits/signal: { range: [80.0, 999.0] } - - &r2_cuts - forward_wall_hits/rnd_sub: { equals: 1 } - forward_wall_hits/time: { range: [22.681788, 28.352235] } - forward_wall_hits/signal: { range: [80.0, 999.0] } - &w1_cuts forward_wall_hits/ring: { range: [1.0, 5.0] } forward_wall_hits/beta: { range: [0.84, 1.0] } @@ -67,7 +46,6 @@ hades_analysis: type: track phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/efficiency -# weight: Ones norm: m corrections: - recentering @@ -75,12 +53,8 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity -# - *axis_protons_eta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} -# mdc_vtx_tracks_extra/is_in_protons_acceptance: {equals: 1} -# charge-cuts: -# mdc_vtx_tracks_extra/is_positive: {equals: 1} qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT @@ -121,28 +95,6 @@ hades_analysis: qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# -# - name: R1 -# type: track -# phi: forward_wall_hits/phi -# weight: forward_wall_hits/signal -# norm: m -# corrections: -# - recentering -# - twist-and-rescale -# cuts: -# *r1_cuts -# ############################################################# -# - name: R2 -# type: track -# phi: forward_wall_hits/phi -# weight: forward_wall_hits/signal -# norm: m -# corrections: -# - recentering -# - twist-and-rescale -# cuts: -# *r2_cuts - ############################################################# - name: W1 type: track phi: forward_wall_hits/phi From 19e5891a02d5be52f773eb18bba9435edb954d91 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 5 May 2021 11:02:15 +0200 Subject: [PATCH 135/274] rescaled u-vectors --- setups/hades/correlation-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 9d703426..cb60746b 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -30,7 +30,7 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: sumw - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } From 449d008ac91b8fdd84599dfb68d611df3df5c96b Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 5 May 2021 18:36:07 +0200 Subject: [PATCH 136/274] fix --- setups/hades/mc-correction-auau-123-even.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-even.yml b/setups/hades/mc-correction-auau-123-even.yml index 4907cad5..6e142b25 100644 --- a/setups/hades/mc-correction-auau-123-even.yml +++ b/setups/hades/mc-correction-auau-123-even.yml @@ -67,8 +67,6 @@ hades_analysis: - *axis_gen_protons_rapidity cuts-pid: *gen_prim_protons_cut - cuts-efficiency: - sim_particles_extra/is_in_high_efficiency: { equals: 1 } qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT From ced38ac364fff1f022a5752a215311276d5f4e80 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 6 May 2021 11:35:16 +0200 Subject: [PATCH 137/274] flow of accepted by tracking particled added --- setups/hades/mc-correction-auau-123-all.yml | 64 ++++++++++----------- setups/hades/mc-correlation-all.yml | 18 ++++-- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 2708b3f3..5534550c 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -1,27 +1,22 @@ _layouts: _axes: - - &axis_gen_protons_pT - name: sim_particles_extra/protons_pT + - &axis_protons_pT + name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - - &axis_gen_pions_pT + - &axis_gen_protons_pT name: sim_particles_extra/pT - bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - - &axis_gen_pions_rapidity - name: sim_particles_extra/pions_rapidity - nb: 17 - lo: 0.09 - hi: 1.79 + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_protons_rapidity + name: mdc_vtx_tracks_extra/protons_rapidity + nb: 15 + lo: -0.75 + hi: 0.75 - &axis_gen_protons_rapidity name: sim_particles_extra/protons_rapidity nb: 15 lo: -0.75 hi: 0.75 - - &axis_gen_protons_eta - name: sim_particles_extra/eta - nb: 44 - lo: 0.0 - hi: 2.2 hades_analysis: event-variables: @@ -29,6 +24,25 @@ hades_analysis: axes: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: + ########################################################################### + - name: accepted + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_protons_pT + - *axis_protons_rapidity + cuts: + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_protons_pT + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] ########################################################################### - name: protons type: track @@ -36,11 +50,9 @@ hades_analysis: weight: Ones cuts: sim_particles_extra/is_charged: {equals: 1} - sim_particles_extra/is_in_protons_acceptance: {equals: 1} axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity -# - *axis_gen_protons_eta qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT @@ -48,26 +60,8 @@ hades_analysis: - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] norm: m ########################################################################### - - name: pions - type: track - phi: sim_particles_extra/phi - weight: Ones - cuts: - sim_particles_extra/is_chrged: {equals: 1} - axes: - - *axis_gen_pions_pT - - *axis_gen_pions_rapidity - qa: - - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_gen_pions_pT - - *axis_gen_pions_rapidity - - [*axis_gen_pions_rapidity, *axis_gen_pions_pT] - norm: m -########################################################################### - name: psi_rp type: psi phi: sim_header/reaction_plane weight: Ones - norm: mag -# qa: -# - {name: sim_header/reaction_plane, nb: 320, lo: -3.2, hi: 3.2} \ No newline at end of file + norm: mag \ No newline at end of file diff --git a/setups/hades/mc-correlation-all.yml b/setups/hades/mc-correlation-all.yml index 8fe1e50e..4d12b1d7 100644 --- a/setups/hades/mc-correlation-all.yml +++ b/setups/hades/mc-correlation-all.yml @@ -1,13 +1,10 @@ _detectors: &detectors + - name: accepted + tags: [ rec_un_vector ] - name: protons tags: [ gen_un_vector ] - correction-step: plain - - name: pions - tags: [ gen_un_vector ] - correction-step: plain - name: psi_rp tags: [ psi_vector ] - correction-step: plain _axes: - ¢rality @@ -23,6 +20,12 @@ _components: [ cos1,sin1 ] _tasks_args: + - &ta_accepted + query: { tags: { any-in: [ rec_un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw - &ta_all query: { tags: { any-in: [ gen_un_vector ] } } query-list: *detectors @@ -37,6 +40,11 @@ _tasks_args: weight: ones _tasks: + - args: [*ta_accepted, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/uQ/reco" + axes: [ *centrality ] - args: [*ta_all, *ta_psi] n-samples: 100 weights-type: observable From a95bb745e186981ce447d2c5c7efff5191ff0f20 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 12 May 2021 12:47:43 +0200 Subject: [PATCH 138/274] is in acceptance cut switched off --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index e045bf8c..2b42a006 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -128,7 +128,7 @@ hades_analysis: cuts-pid: *gen_prim_protons_cut cuts-efficiency: - sim_particles_extra/is_in_acceptance: { equals: 1 } +# sim_particles_extra/is_in_acceptance: { equals: 1 } qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT From b04226e22b85220cf7ff72c7125c5a2e96000bb0 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 14 May 2021 21:38:58 +0200 Subject: [PATCH 139/274] reproducing acceptance and efficiency on gen particles --- setups/hades/mc-correction-auau-123.yml | 21 ++++++++++++++++++++- setups/hades/mc-correlation.yml | 2 ++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 2b42a006..ccba099c 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -128,7 +128,26 @@ hades_analysis: cuts-pid: *gen_prim_protons_cut cuts-efficiency: -# sim_particles_extra/is_in_acceptance: { equals: 1 } + sim_particles_extra/is_in_high_efficiency: { equals: 1 } + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + ############################################################# + - name: gen_prim_protons_weighted + type: track + phi: sim_particles_extra/phi + weight: sim_particles_extra/efficiency + norm: m + axes: + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity +# - *axis_gen_protons_eta + cuts-pid: + *gen_prim_protons_cut + cuts-efficiency: + sim_particles_extra/is_in_high_efficiency: { equals: 1 } qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index ab4e23ec..93841b58 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -3,6 +3,8 @@ _detectors: &detectors tags: [ un_vector ] - name: gen_prim_protons tags: [ gen_un_vector ] + - name: gen_prim_protons_weighted + tags: [ gen_un_vector ] - name: psi_rp tags: [ psi_vector ] - name: W1 From 829c56ee1144eec36a9b6ea8a232815e72cad428 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 17 May 2021 17:35:33 +0200 Subject: [PATCH 140/274] New preprocessing branch names --- setups/hades/correction-auau-123.yml | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index f95742ab..10bdfa22 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -2,48 +2,48 @@ _layouts: _axes: - &axis_protons_pT - name: mdc_vtx_tracks_rapidity/pT + name: mdc_vtx_tracks_extra/pT bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - &axis_pT_uniform - name: mdc_vtx_tracks_rapidity/pT + name: mdc_vtx_tracks_extra/pT nb: 16 lo: 0.0 hi: 1.6 - &axis_pions_pT - name: mdc_vtx_tracks_rapidity/pT + name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] - &axis_protons_rapidity - name: mdc_vtx_tracks_rapidity/ycm + name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 - &axis_protons_eta - name: mdc_vtx_tracks_rapidity/eta + name: mdc_vtx_tracks_extra/eta nb: 44 lo: 0.0 hi: 2.2 - &axis_pions_rapidity - name: mdc_vtx_tracks_rapidity/ycm + name: mdc_vtx_tracks_extra/ycm nb: 17 lo: -0.65 hi: 0.95 _cuts: - &protons_cuts - mdc_vtx_tracks_rapidity/pid: { equals: 2212 } + mdc_vtx_tracks_extra/pid: { equals: 2212 } - &pion_plus_cuts - mdc_vtx_tracks_rapidity/pid: { equals: 211 } + mdc_vtx_tracks_extra/pid: { equals: 211 } - &pion_minus_cuts - mdc_vtx_tracks_rapidity/pid: { equals: -211 } + mdc_vtx_tracks_extra/pid: { equals: -211 } - &good_particle_cuts - mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - &mf_cuts - mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_rapidity/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} - &mb_cuts - mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_rapidity/rapidity: {range: [0.19, 0.39]} + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} - &r1_cuts forward_wall_hits/rnd_sub: { equals: 0 } forward_wall_hits/time: { range: [22.681788, 28.352235] } @@ -74,8 +74,8 @@ hades_analysis: ############################################################# - name: protons type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering @@ -89,14 +89,14 @@ hades_analysis: cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# - name: Mf type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -109,11 +109,11 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: Mb type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -126,7 +126,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: W1 type: track From 994890ec6c268489df0a373d58479ee927e6a8f7 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 18 May 2021 22:47:53 +0200 Subject: [PATCH 141/274] Four dimensional correlations --- setups/hades/mc-correction-auau-123.yml | 31 +++++-------------------- setups/hades/mc-correlation.yml | 2 -- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index ccba099c..c86bb41e 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -14,7 +14,7 @@ _axes: hi: 0.75 - &axis_protons_eta name: mdc_vtx_tracks_extra/eta - nb: 44 + nb: 11 lo: 0.0 hi: 2.2 - &axis_gen_protons_rapidity @@ -24,7 +24,7 @@ _axes: hi: 0.75 - &axis_gen_protons_eta name: sim_particles_extra/eta - nb: 44 + nb: 11 lo: 0.0 hi: 2.2 _cuts: @@ -71,7 +71,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity -# - *axis_protons_eta + - *axis_protons_eta cuts-pid: *pid_protons_cut cuts-quality: @@ -124,30 +124,11 @@ hades_analysis: axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity -# - *axis_gen_protons_eta + - *axis_gen_protons_eta cuts-pid: *gen_prim_protons_cut - cuts-efficiency: - sim_particles_extra/is_in_high_efficiency: { equals: 1 } - qa: - - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_gen_protons_pT - - *axis_gen_protons_rapidity - - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] - ############################################################# - - name: gen_prim_protons_weighted - type: track - phi: sim_particles_extra/phi - weight: sim_particles_extra/efficiency - norm: m - axes: - - *axis_gen_protons_pT - - *axis_gen_protons_rapidity -# - *axis_gen_protons_eta - cuts-pid: - *gen_prim_protons_cut - cuts-efficiency: - sim_particles_extra/is_in_high_efficiency: { equals: 1 } +# cuts-efficiency: +# sim_particles_extra/is_in_high_efficiency: { equals: 1 } qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 93841b58..ab4e23ec 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -3,8 +3,6 @@ _detectors: &detectors tags: [ un_vector ] - name: gen_prim_protons tags: [ gen_un_vector ] - - name: gen_prim_protons_weighted - tags: [ gen_un_vector ] - name: psi_rp tags: [ psi_vector ] - name: W1 From 1a04deed6f347686e0adf57cb302a42ca4b7f83e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 18 May 2021 22:49:23 +0200 Subject: [PATCH 142/274] Four dimensional correlations --- setups/hades/correction-auau-123.yml | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 10bdfa22..9bfb1793 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -3,15 +3,7 @@ _layouts: _axes: - &axis_protons_pT name: mdc_vtx_tracks_extra/pT - bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - - &axis_pT_uniform - name: mdc_vtx_tracks_extra/pT - nb: 16 - lo: 0.0 - hi: 1.6 - - &axis_pions_pT - name: mdc_vtx_tracks_extra/pT - bin-edges: [0, 0.0825, 0.1075, 0.1275, 0.1525, 0.1775, 0.2075, 0.2475, 0.3075, 0.4725, 1.0] + bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm nb: 15 @@ -19,21 +11,12 @@ _axes: hi: 0.75 - &axis_protons_eta name: mdc_vtx_tracks_extra/eta - nb: 44 + nb: 11 lo: 0.0 hi: 2.2 - - &axis_pions_rapidity - name: mdc_vtx_tracks_extra/ycm - nb: 17 - lo: -0.65 - hi: 0.95 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } - - &pion_plus_cuts - mdc_vtx_tracks_extra/pid: { equals: 211 } - - &pion_minus_cuts - mdc_vtx_tracks_extra/pid: { equals: -211 } - &good_particle_cuts mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} @@ -83,7 +66,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity -# - *axis_protons_eta + - *axis_protons_eta cuts-pid: *protons_cuts cuts-quality: From 8852a03a0029adedbd7eb8f9ddf73c9aa3f5d7ff Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 18 May 2021 22:50:47 +0200 Subject: [PATCH 143/274] Four dimensional correlations --- setups/hades/correction-auau-123-all.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 29f88d01..3f656f44 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -5,10 +5,15 @@ _axes: name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_protons_rapidity - name: mdc_vtx_tracks_extra/protons_rapidity + name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 + - &axis_protons_eta + name: mdc_vtx_tracks_extra/eta + nb: 11 + lo: 0.0 + hi: 2.2 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -53,6 +58,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity + - *axis_protons_eta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} qa: From 4bee0aabaed2c5d51215a5b30895e22d019c0b3c Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 18 May 2021 22:53:53 +0200 Subject: [PATCH 144/274] Four dimensional correlations --- setups/hades/mc-correction-auau-123-all.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 5534550c..e8f078ea 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -8,15 +8,25 @@ _axes: name: sim_particles_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_protons_rapidity - name: mdc_vtx_tracks_extra/protons_rapidity + name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 + - &axis_protons_eta + name: mdc_vtx_tracks_extra/eta + nb: 11 + lo: 0.0 + hi: 2.2 - &axis_gen_protons_rapidity - name: sim_particles_extra/protons_rapidity + name: sim_particles_extra/ycm nb: 15 lo: -0.75 hi: 0.75 + - &axis_gen_protons_eta + name: sim_particles_extra/eta + nb: 11 + lo: 0.0 + hi: 2.2 hades_analysis: event-variables: @@ -36,6 +46,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity + - *axis_protons_eta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} qa: @@ -53,6 +64,7 @@ hades_analysis: axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity + - *axis_gen_protons_eta qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT From 4c29f9a537301a1dbea279fa792574d6931826ef Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 20 May 2021 10:34:01 +0200 Subject: [PATCH 145/274] No extra branches for MC is requiered --- setups/hades/mc-correction-auau-123.yml | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index c86bb41e..5c186ec3 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -44,14 +44,14 @@ _cuts: mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - &w1_cuts - reconstructed_forward_wall_hits/ring: { range: [1.0, 5.0] } - reconstructed_forward_wall_hits/signal: { range: [80.0, 999.0] } + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } - &w2_cuts - reconstructed_forward_wall_hits/ring: { range: [6.0, 7.0] } - reconstructed_forward_wall_hits/signal: { range: [85.0, 999.0] } + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } - &w3_cuts - reconstructed_forward_wall_hits/ring: { range: [8.0, 10.0] } - reconstructed_forward_wall_hits/signal: { range: [88.0, 999.0] } + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } hades_analysis: event-variables: @@ -137,8 +137,8 @@ hades_analysis: ########################################################################### - name: W1 type: track - phi: reconstructed_forward_wall_hits/phi - weight: reconstructed_forward_wall_hits/signal + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal norm: m corrections: - recentering @@ -146,12 +146,12 @@ hades_analysis: cuts-w1: *w1_cuts qa: - - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} ########################################################################### - name: W2 type: track - phi: reconstructed_forward_wall_hits/phi - weight: reconstructed_forward_wall_hits/signal + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal norm: m corrections: - recentering @@ -159,12 +159,12 @@ hades_analysis: cuts-w2: *w2_cuts qa: - - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} ########################################################################### - name: W3 type: track - phi: reconstructed_forward_wall_hits/phi - weight: reconstructed_forward_wall_hits/signal + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal norm: m corrections: - recentering @@ -172,7 +172,7 @@ hades_analysis: cuts-w3: *w3_cuts qa: - - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} ########################################################################### - name: psi_rp type: psi From 396923ca09f0b99b073d7817137392df9b6157a0 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 27 May 2021 12:14:43 +0300 Subject: [PATCH 146/274] No efficiency weighting for all particles flow --- setups/hades/correction-auau-123-all.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 3f656f44..6db8b6a6 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -50,7 +50,8 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency +# weight: mdc_vtx_tracks_extra/efficiency + weight: Ones norm: m corrections: - recentering From 57ed0dfb5ebb002b415da9adf21faa009916b701 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 28 May 2021 18:39:06 +0300 Subject: [PATCH 147/274] v1 all as a function of pT and rapidity --- setups/hades/correction-auau-123-all.yml | 6 +++--- setups/hades/mc-correction-auau-123-all.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 6db8b6a6..56cd1b99 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -11,9 +11,9 @@ _axes: hi: 0.75 - &axis_protons_eta name: mdc_vtx_tracks_extra/eta - nb: 11 + nb: 20 lo: 0.0 - hi: 2.2 + hi: 2.0 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -58,7 +58,7 @@ hades_analysis: - twist-and-rescale axes: - *axis_protons_pT - - *axis_protons_rapidity +# - *axis_protons_rapidity - *axis_protons_eta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index e8f078ea..57fee750 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -24,9 +24,9 @@ _axes: hi: 0.75 - &axis_gen_protons_eta name: sim_particles_extra/eta - nb: 11 + nb: 20 lo: 0.0 - hi: 2.2 + hi: 2.0 hades_analysis: event-variables: @@ -45,7 +45,7 @@ hades_analysis: - twist-and-rescale axes: - *axis_protons_pT - - *axis_protons_rapidity +# - *axis_protons_rapidity - *axis_protons_eta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} @@ -63,7 +63,7 @@ hades_analysis: sim_particles_extra/is_charged: {equals: 1} axes: - *axis_gen_protons_pT - - *axis_gen_protons_rapidity +# - *axis_gen_protons_rapidity - *axis_gen_protons_eta qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} From 63334f5ad5e368bda19bcfbe5b4cc911a13f59e7 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 28 May 2021 18:40:12 +0300 Subject: [PATCH 148/274] fix --- setups/hades/mc-correction-auau-123-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 57fee750..381d800e 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -14,9 +14,9 @@ _axes: hi: 0.75 - &axis_protons_eta name: mdc_vtx_tracks_extra/eta - nb: 11 + nb: 20 lo: 0.0 - hi: 2.2 + hi: 2.0 - &axis_gen_protons_rapidity name: sim_particles_extra/ycm nb: 15 From 683f9a8fd9100ed2759d82fb77deeb08d457481a Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 28 May 2021 18:41:17 +0300 Subject: [PATCH 149/274] Number of bins along eta increased --- setups/hades/correction-auau-123.yml | 4 ++-- setups/hades/mc-correction-auau-123.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 9bfb1793..c4ec0c54 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -11,9 +11,9 @@ _axes: hi: 0.75 - &axis_protons_eta name: mdc_vtx_tracks_extra/eta - nb: 11 + nb: 20 lo: 0.0 - hi: 2.2 + hi: 2.0 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 5c186ec3..7aa2e4b6 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -14,9 +14,9 @@ _axes: hi: 0.75 - &axis_protons_eta name: mdc_vtx_tracks_extra/eta - nb: 11 + nb: 20 lo: 0.0 - hi: 2.2 + hi: 2.0 - &axis_gen_protons_rapidity name: sim_particles_extra/ycm nb: 15 @@ -24,9 +24,9 @@ _axes: hi: 0.75 - &axis_gen_protons_eta name: sim_particles_extra/eta - nb: 11 + nb: 20 lo: 0.0 - hi: 2.2 + hi: 2.0 _cuts: - &pid_protons_cut mdc_vtx_tracks_extra/pid: { equals: 2212 } From c03ea29a9715575c9cac9f9c886bb8fe7966c245 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 2 Jun 2021 02:07:54 +0300 Subject: [PATCH 150/274] 30 bins along y-axis --- setups/hades/correction-auau-123.yml | 2 +- setups/hades/mc-correction-auau-123-all.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index c4ec0c54..6bea07a7 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -6,7 +6,7 @@ _axes: bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm - nb: 15 + nb: 30 lo: -0.75 hi: 0.75 - &axis_protons_eta diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 381d800e..f3edaafb 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -9,7 +9,7 @@ _axes: bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm - nb: 15 + nb: 30 lo: -0.75 hi: 0.75 - &axis_protons_eta @@ -19,7 +19,7 @@ _axes: hi: 2.0 - &axis_gen_protons_rapidity name: sim_particles_extra/ycm - nb: 15 + nb: 30 lo: -0.75 hi: 0.75 - &axis_gen_protons_eta From ecc206420e60e9aa97c27af27528e8225b91fb3c Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 2 Jun 2021 17:43:46 +0300 Subject: [PATCH 151/274] 30 bins along y-axis --- setups/hades/mc-correction-auau-123.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 7aa2e4b6..e94212e3 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -9,7 +9,7 @@ _axes: bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm - nb: 15 + nb: 30 lo: -0.75 hi: 0.75 - &axis_protons_eta @@ -19,7 +19,7 @@ _axes: hi: 2.0 - &axis_gen_protons_rapidity name: sim_particles_extra/ycm - nb: 15 + nb: 30 lo: -0.75 hi: 0.75 - &axis_gen_protons_eta From c0c992918ec5b528aa34fd5748c3669d5c4223c3 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 11 Jun 2021 21:30:08 +0300 Subject: [PATCH 152/274] Normalization removed --- setups/hades/correction-auau-123-all.yml | 8 +++---- setups/hades/mc-correction-auau-123-all.yml | 23 +++++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 56cd1b99..1d38f03a 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -11,9 +11,9 @@ _axes: hi: 0.75 - &axis_protons_eta name: mdc_vtx_tracks_extra/eta - nb: 20 + nb: 11 lo: 0.0 - hi: 2.0 + hi: 2.2 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -52,12 +52,12 @@ hades_analysis: phi: mdc_vtx_tracks_extra/phi # weight: mdc_vtx_tracks_extra/efficiency weight: Ones - norm: m +# norm: m corrections: - recentering - twist-and-rescale axes: - - *axis_protons_pT +# - *axis_protons_pT # - *axis_protons_rapidity - *axis_protons_eta cuts: diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index f3edaafb..3f4246bb 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -9,24 +9,24 @@ _axes: bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm - nb: 30 + nb: 15 lo: -0.75 hi: 0.75 - &axis_protons_eta name: mdc_vtx_tracks_extra/eta - nb: 20 + nb: 11 lo: 0.0 - hi: 2.0 + hi: 2.2 - &axis_gen_protons_rapidity name: sim_particles_extra/ycm - nb: 30 + nb: 15 lo: -0.75 hi: 0.75 - &axis_gen_protons_eta name: sim_particles_extra/eta - nb: 20 + nb: 11 lo: 0.0 - hi: 2.0 + hi: 2.2 hades_analysis: event-variables: @@ -38,13 +38,14 @@ hades_analysis: - name: accepted type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency - norm: m +# weight: mdc_vtx_tracks_extra/efficiency + weight: Ones +# norm: m corrections: - recentering - twist-and-rescale axes: - - *axis_protons_pT +# - *axis_protons_pT # - *axis_protons_rapidity - *axis_protons_eta cuts: @@ -59,10 +60,11 @@ hades_analysis: type: track phi: sim_particles_extra/phi weight: Ones +# norm: m cuts: sim_particles_extra/is_charged: {equals: 1} axes: - - *axis_gen_protons_pT +# - *axis_gen_protons_pT # - *axis_gen_protons_rapidity - *axis_gen_protons_eta qa: @@ -70,7 +72,6 @@ hades_analysis: - *axis_gen_protons_pT - *axis_gen_protons_rapidity - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] - norm: m ########################################################################### - name: psi_rp type: psi From 0f15677c0cb8a76bf49acd713e3da2737a27533a Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 13 Jun 2021 00:25:48 +0300 Subject: [PATCH 153/274] flow all vs theta --- setups/hades/mc-correction-auau-123-all.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 3f4246bb..01fb6830 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -17,6 +17,11 @@ _axes: nb: 11 lo: 0.0 hi: 2.2 + - &axis_protons_theta + name: mdc_vtx_tracks_extra/theta + nb: 12 + lo: 0.3 + hi: 1.5 - &axis_gen_protons_rapidity name: sim_particles_extra/ycm nb: 15 @@ -27,6 +32,11 @@ _axes: nb: 11 lo: 0.0 hi: 2.2 + - &axis_gen_protons_theta + name: sim_particles_extra/theta + nb: 12 + lo: 0.3 + hi: 1.5 hades_analysis: event-variables: @@ -47,7 +57,7 @@ hades_analysis: axes: # - *axis_protons_pT # - *axis_protons_rapidity - - *axis_protons_eta + - *axis_protons_theta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} qa: @@ -66,7 +76,7 @@ hades_analysis: axes: # - *axis_gen_protons_pT # - *axis_gen_protons_rapidity - - *axis_gen_protons_eta + - *axis_gen_protons_theta qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT From 9a623c963bd6ffe493899333f6ce72c6e43f064d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 13 Jun 2021 00:26:09 +0300 Subject: [PATCH 154/274] flow all vs theta --- setups/hades/mc-correction-auau-123-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 01fb6830..e0a9a295 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -50,7 +50,7 @@ hades_analysis: phi: mdc_vtx_tracks_extra/phi # weight: mdc_vtx_tracks_extra/efficiency weight: Ones -# norm: m + norm: m corrections: - recentering - twist-and-rescale @@ -70,7 +70,7 @@ hades_analysis: type: track phi: sim_particles_extra/phi weight: Ones -# norm: m + norm: m cuts: sim_particles_extra/is_charged: {equals: 1} axes: From daa2d8c8b814286dfc97c2c658273b6564be0e9e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 5 Jul 2021 17:18:53 +0300 Subject: [PATCH 155/274] eta axis is in cm --- setups/hades/correction-auau-123.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 6bea07a7..87232750 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -6,14 +6,14 @@ _axes: bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm - nb: 30 + nb: 15 lo: -0.75 hi: 0.75 - &axis_protons_eta - name: mdc_vtx_tracks_extra/eta - nb: 20 - lo: 0.0 - hi: 2.0 + name: mdc_vtx_tracks_extra/eta_cm + nb: 15 + lo: -1.8 + hi: 1.2 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } From 183dcfcc0196bdaf5a77fed377a6fe00f515d59a Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 5 Jul 2021 17:19:49 +0300 Subject: [PATCH 156/274] eta axis is in cm --- setups/hades/correction-auau-123-all.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 1d38f03a..0664b7fb 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -10,10 +10,10 @@ _axes: lo: -0.75 hi: 0.75 - &axis_protons_eta - name: mdc_vtx_tracks_extra/eta - nb: 11 - lo: 0.0 - hi: 2.2 + name: mdc_vtx_tracks_extra/eta_cm + nb: 15 + lo: -1.8 + hi: 1.2 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } From 2955a385b7bce52a7fe84510d13dc365c7d87fdd Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 5 Jul 2021 17:20:29 +0300 Subject: [PATCH 157/274] eta axis is in cm --- setups/hades/correction-auau-123-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 0664b7fb..13b8b40a 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -52,7 +52,7 @@ hades_analysis: phi: mdc_vtx_tracks_extra/phi # weight: mdc_vtx_tracks_extra/efficiency weight: Ones -# norm: m + norm: m corrections: - recentering - twist-and-rescale From 89554c8ee8728cc24f145a4191b84d982ca78c74 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 5 Jul 2021 17:22:58 +0300 Subject: [PATCH 158/274] eta axis is in cm --- setups/hades/mc-correction-auau-123.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index e94212e3..91916181 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -9,24 +9,24 @@ _axes: bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm - nb: 30 + nb: 15 lo: -0.75 hi: 0.75 - &axis_protons_eta - name: mdc_vtx_tracks_extra/eta - nb: 20 - lo: 0.0 - hi: 2.0 + name: mdc_vtx_tracks_extra/eta_cm + nb: 15 + lo: -1.8 + hi: 1.2 - &axis_gen_protons_rapidity name: sim_particles_extra/ycm - nb: 30 + nb: 15 lo: -0.75 hi: 0.75 - &axis_gen_protons_eta - name: sim_particles_extra/eta - nb: 20 - lo: 0.0 - hi: 2.0 + name: sim_particles_extra/eta_cm + nb: 15 + lo: -1.8 + hi: 1.2 _cuts: - &pid_protons_cut mdc_vtx_tracks_extra/pid: { equals: 2212 } From b545fd258770db25019988d442569a2b10a7224a Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 5 Jul 2021 17:24:55 +0300 Subject: [PATCH 159/274] eta axis is in cm --- setups/hades/mc-correction-auau-123-all.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index e0a9a295..17796954 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -13,10 +13,10 @@ _axes: lo: -0.75 hi: 0.75 - &axis_protons_eta - name: mdc_vtx_tracks_extra/eta - nb: 11 - lo: 0.0 - hi: 2.2 + name: mdc_vtx_tracks_extra/eta_cm + nb: 15 + lo: -1.8 + hi: 1.2 - &axis_protons_theta name: mdc_vtx_tracks_extra/theta nb: 12 @@ -28,10 +28,10 @@ _axes: lo: -0.75 hi: 0.75 - &axis_gen_protons_eta - name: sim_particles_extra/eta - nb: 11 - lo: 0.0 - hi: 2.2 + name: sim_particles_extra/eta_cm + nb: 15 + lo: -1.8 + hi: 1.2 - &axis_gen_protons_theta name: sim_particles_extra/theta nb: 12 @@ -48,7 +48,6 @@ hades_analysis: - name: accepted type: track phi: mdc_vtx_tracks_extra/phi -# weight: mdc_vtx_tracks_extra/efficiency weight: Ones norm: m corrections: @@ -57,7 +56,7 @@ hades_analysis: axes: # - *axis_protons_pT # - *axis_protons_rapidity - - *axis_protons_theta + - *axis_protons_eta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} qa: @@ -76,7 +75,7 @@ hades_analysis: axes: # - *axis_gen_protons_pT # - *axis_gen_protons_rapidity - - *axis_gen_protons_theta + - *axis_gen_protons_eta qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT From 5fa03fdc6dc70d19f34369dbb2824e9a9aac8235 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 7 Jul 2021 16:21:49 +0300 Subject: [PATCH 160/274] elliptic flow added --- setups/hades/mc-correlation.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index ab4e23ec..e0e17854 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -26,6 +26,8 @@ _axes: _components: - &sp_components [ x1,y1 ] + - &sp2_components + [ x2,y2 ] _tasks_args: - &ta_reco @@ -34,11 +36,22 @@ _tasks_args: components: *sp_components correction-steps: [ rescaled ] weight: sumw + - &ta_reco2 + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: sumw - &ta_sim query: { tags: { any-in: [ gen_un_vector ] } } query-list: *detectors components: *sp_components correction-steps: [ plain ] + - &ta_sim2 + query: { tags: { any-in: [ gen_un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] weight: sumw - &ta_psi query: { tags: { any-in: [ psi_vector ] } } @@ -46,6 +59,12 @@ _tasks_args: components: *sp_components correction-steps: [ plain ] weight: ones + - &ta_psi2 + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: ones - &ta_qn query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors @@ -59,6 +78,11 @@ _tasks: weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] + - args: [*ta_reco2, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u2Q2/reco" + axes: [ *centrality ] - args: [*ta_reco, *ta_qn] n-samples: 100 weights-type: observable @@ -69,6 +93,11 @@ _tasks: weights-type: observable folder: "/uQ/gen" axes: [ *centrality ] + - args: [*ta_sim2, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u2Q2/gen" + axes: [ *centrality ] - args: [*ta_qn, *ta_psi] n-samples: 100 weights-type: reference From 90d851053a0d5a60019e0ca0664d527171866243 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 11 Jul 2021 12:30:46 +0300 Subject: [PATCH 161/274] Mcini setup --- setups/hades/correction-mcini.yml | 43 +++++++++++++++++++++++ setups/hades/correlation-mcini.yml | 56 ++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 setups/hades/correction-mcini.yml create mode 100644 setups/hades/correlation-mcini.yml diff --git a/setups/hades/correction-mcini.yml b/setups/hades/correction-mcini.yml new file mode 100644 index 00000000..2d6226b8 --- /dev/null +++ b/setups/hades/correction-mcini.yml @@ -0,0 +1,43 @@ +_layouts: + +_axes: + - &axis_protons_pT + name: particles/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_protons_rapidity + name: particles/rapidity + nb: 15 + lo: -0.75 + hi: 0.75 + +hades_analysis: + event-variables: + - event_header/centrality + axes: + - { name: event_header/centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: + ########################################################################### + - name: protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_protons_pT + - *axis_protons_rapidity + cuts-pid: + particles/pid: { equals: 2212 } + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_protons_pT + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] + ########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag \ No newline at end of file diff --git a/setups/hades/correlation-mcini.yml b/setups/hades/correlation-mcini.yml new file mode 100644 index 00000000..5b381bf2 --- /dev/null +++ b/setups/hades/correlation-mcini.yml @@ -0,0 +1,56 @@ +_detectors: &detectors + - name: protons + tags: [ un_vector ] + - name: psi_rp + tags: [ psi_vector ] + +_axes: + - ¢rality + name: event_header_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + - &sp2_components + [ x2,y2 ] + +_tasks_args: + - &ta_u + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_u2 + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + - &ta_psi2 + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_u, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/uQ/protons" + axes: [ *centrality ] + - args: [*ta_u2, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u2Q2/protons" + axes: [ *centrality ] \ No newline at end of file From 0c621f7171f54979ca9ea1d4aa75da0ec8423d29 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 11 Jul 2021 19:37:15 +0300 Subject: [PATCH 162/274] fix --- setups/hades/correction-mcini.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-mcini.yml b/setups/hades/correction-mcini.yml index 2d6226b8..c65719cc 100644 --- a/setups/hades/correction-mcini.yml +++ b/setups/hades/correction-mcini.yml @@ -19,8 +19,8 @@ hades_analysis: ########################################################################### - name: protons type: track - phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency + phi: particles/phi + weight: particles/efficiency norm: m corrections: - recentering @@ -31,7 +31,7 @@ hades_analysis: cuts-pid: particles/pid: { equals: 2212 } qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - {name: particles/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] From 26223292b6d40bf6c51274d2ad30c995822778a3 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 11 Jul 2021 19:39:46 +0300 Subject: [PATCH 163/274] fix --- setups/hades/correction-mcini.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-mcini.yml b/setups/hades/correction-mcini.yml index c65719cc..edba6ca6 100644 --- a/setups/hades/correction-mcini.yml +++ b/setups/hades/correction-mcini.yml @@ -38,6 +38,6 @@ hades_analysis: ########################################################################### - name: psi_rp type: psi - phi: sim_header/reaction_plane + phi: event_header/reaction_plane weight: Ones norm: mag \ No newline at end of file From 6c856a038f7b955e0501dc27ba88dd1269482ef3 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 11 Jul 2021 19:44:42 +0300 Subject: [PATCH 164/274] fix --- setups/hades/correction-mcini.yml | 3 --- setups/hades/correlation-mcini.yml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/setups/hades/correction-mcini.yml b/setups/hades/correction-mcini.yml index edba6ca6..5284ebaf 100644 --- a/setups/hades/correction-mcini.yml +++ b/setups/hades/correction-mcini.yml @@ -22,9 +22,6 @@ hades_analysis: phi: particles/phi weight: particles/efficiency norm: m - corrections: - - recentering - - twist-and-rescale axes: - *axis_protons_pT - *axis_protons_rapidity diff --git a/setups/hades/correlation-mcini.yml b/setups/hades/correlation-mcini.yml index 5b381bf2..ac2aa150 100644 --- a/setups/hades/correlation-mcini.yml +++ b/setups/hades/correlation-mcini.yml @@ -22,13 +22,13 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - &ta_u2 query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp2_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - &ta_psi query: { tags: { any-in: [ psi_vector ] } } From f380b325bb344034a17e184b90bf03ffe9bf5b21 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 11 Jul 2021 20:03:07 +0300 Subject: [PATCH 165/274] fix --- setups/hades/correction-mcini.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-mcini.yml b/setups/hades/correction-mcini.yml index 5284ebaf..74160a83 100644 --- a/setups/hades/correction-mcini.yml +++ b/setups/hades/correction-mcini.yml @@ -20,7 +20,7 @@ hades_analysis: - name: protons type: track phi: particles/phi - weight: particles/efficiency + weight: Ones norm: m axes: - *axis_protons_pT From d4e8cfdde2bb8cc6086e22063ed9efdbb9016b17 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 12 Jul 2021 10:15:50 +0300 Subject: [PATCH 166/274] Fix --- setups/hades/correction-mcini.yml | 2 +- setups/hades/correlation-mcini.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/correction-mcini.yml b/setups/hades/correction-mcini.yml index 74160a83..0ce82ef3 100644 --- a/setups/hades/correction-mcini.yml +++ b/setups/hades/correction-mcini.yml @@ -14,7 +14,7 @@ hades_analysis: event-variables: - event_header/centrality axes: - - { name: event_header/centrality, nb: 12, lo: 0.0, hi: 60 } + - { name: event_header/centrality, nb: 6, lo: 0.0, hi: 60 } q-vectors: ########################################################################### - name: protons diff --git a/setups/hades/correlation-mcini.yml b/setups/hades/correlation-mcini.yml index ac2aa150..f20ea407 100644 --- a/setups/hades/correlation-mcini.yml +++ b/setups/hades/correlation-mcini.yml @@ -7,7 +7,7 @@ _detectors: &detectors _axes: - ¢rality name: event_header_centrality - nb: 12 + nb: 6 lo: 0 hi: 60 From 576ca7c5803f4e78eb880392866c31992142bccb Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 14 Jul 2021 18:23:01 +0300 Subject: [PATCH 167/274] weighting of flow of all --- setups/hades/correction-auau-123-all.yml | 4 ++-- setups/hades/mc-correction-auau-123-all.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 13b8b40a..4f8cfcc7 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -50,8 +50,8 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_extra/phi -# weight: mdc_vtx_tracks_extra/efficiency - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency +# weight: Ones norm: m corrections: - recentering diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 17796954..8e8c7f61 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -48,7 +48,8 @@ hades_analysis: - name: accepted type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency +# weight: Ones norm: m corrections: - recentering From 23141995ebb2f2b2115d80b0cdc89a6d423d863b Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 15 Jul 2021 17:08:47 +0300 Subject: [PATCH 168/274] unit weight --- setups/hades/mc-correction-auau-123-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 8e8c7f61..0ae72c13 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -48,8 +48,8 @@ hades_analysis: - name: accepted type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency -# weight: Ones +# weight: mdc_vtx_tracks_extra/efficiency + weight: Ones norm: m corrections: - recentering From dfa3019d1bb62c52adc70a0c17628a79a27d2abf Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 27 Jul 2021 18:36:21 +0300 Subject: [PATCH 169/274] Elliptic flow added with respect to spectator plane with mixed harmonic method and to produced plane of the same harmonic --- setups/hades/correction-auau-123.yml | 17 ++++++++++++++- setups/hades/correlation-auau-123.yml | 31 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 87232750..4a82b3f7 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -66,7 +66,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity - - *axis_protons_eta +# - *axis_protons_eta cuts-pid: *protons_cuts cuts-quality: @@ -77,6 +77,21 @@ hades_analysis: - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# + - name: pions + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-quality: + *good_particle_cuts + cuts-pid: + mdc_vtx_tracks_extra/is_pion: { equals: 1 } + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# - name: Mf type: track phi: mdc_vtx_tracks_extra/phi diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index cb60746b..c82de839 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -1,6 +1,8 @@ _detectors: &detectors - name: protons tags: [ un_vector ] + - name: pions + tags: [ q2_vector ] - name: W1 tags: [ qn_vector ] - name: W2 @@ -22,6 +24,8 @@ _axes: _components: - &sp_components [ x1,y1 ] + - &sp2_components + [ x2,y2 ] - &ep_components [ cos1,sin1 ] @@ -32,12 +36,24 @@ _tasks_args: components: *sp_components correction-steps: [ rescaled ] weight: sumw + - &ta_u2 + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: sumw - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components correction-steps: [ rescaled ] weight: ones + - &ta_q2_sp + query: { tags: { any-in: [ q2_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: ones - &ta_qn_ep query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors @@ -63,6 +79,16 @@ _tasks: weights-type: observable folder: "/SP/uQ" axes: [ *centrality ] + - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u2Q1Q1" + axes: [ *centrality ] + - args: [*ta_u2, *ta_q2_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u2Q2" + axes: [ *centrality ] - args: [*ta_u, *ta_qn_ep] n-samples: 100 weights-type: observable @@ -74,6 +100,11 @@ _tasks: weights-type: reference folder: "/SP/QQ" axes: [ *centrality ] + - args: [*ta_q2_sp, *ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/Q2Q1Q1" + axes: [ *centrality ] - args: [*ta_qn_ep, *ta_qn_ep] n-samples: 100 weights-type: reference From 35e2e77397beea671e93281ca61451eaf9da6c40 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 27 Jul 2021 18:49:20 +0300 Subject: [PATCH 170/274] Elliptic flow added with respect to spectator plane with mixed harmonic method and to produced plane of the same harmonic --- setups/hades/correction-agag-123.yml | 25 +++++++++------- setups/hades/correction-agag-158.yml | 41 ++++++++++++++++----------- setups/hades/correlation-agag-123.yml | 31 ++++++++++++++++++++ setups/hades/correlation-agag-158.yml | 31 ++++++++++++++++++++ 4 files changed, 102 insertions(+), 26 deletions(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 5cb572d6..0a6df7a5 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -3,12 +3,7 @@ _layouts: _axes: - &axis_pT name: mdc_vtx_tracks_rapidity/pT - bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - - &axis_pT_uniform - name: mdc_vtx_tracks_rapidity/pT - nb: 16 - lo: 0.0 - hi: 1.6 + bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity name: mdc_vtx_tracks_rapidity/ycm nb: 15 @@ -17,10 +12,6 @@ _axes: _cuts: - &protons_cuts mdc_vtx_tracks_rapidity/pid: { equals: 2212 } - - &pion_plus_cuts - mdc_vtx_tracks_rapidity/pid: { equals: 211 } - - &pion_minus_cuts - mdc_vtx_tracks_rapidity/pid: { equals: -211 } - &good_particle_cuts mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} @@ -78,6 +69,20 @@ hades_analysis: - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] + - name: pions + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-quality: + *good_particle_cuts + cuts-pid: + mdc_vtx_tracks_extra/is_pion: { equals: 1 } + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - name: Mf type: track phi: mdc_vtx_tracks_rapidity/phi diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index 7ffa5c9f..a10b6eef 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -3,12 +3,7 @@ _layouts: _axes: - &axis_pT name: mdc_vtx_tracks_rapidity/pT - bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - - &axis_pT_uniform - name: mdc_vtx_tracks_rapidity/pT - nb: 16 - lo: 0.0 - hi: 1.6 + bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity name: mdc_vtx_tracks_rapidity/ycm nb: 15 @@ -17,10 +12,6 @@ _axes: _cuts: - &protons_cuts mdc_vtx_tracks_rapidity/pid: { equals: 2212 } - - &pion_plus_cuts - mdc_vtx_tracks_rapidity/pid: { equals: 211 } - - &pion_minus_cuts - mdc_vtx_tracks_rapidity/pid: { equals: -211 } - &good_particle_cuts mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} @@ -58,6 +49,7 @@ hades_analysis: axes: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: + ############################################################# - name: protons type: track phi: mdc_vtx_tracks_rapidity/phi @@ -78,6 +70,22 @@ hades_analysis: - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] + ############################################################# + - name: pions + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + cuts-quality: + *good_particle_cuts + cuts-pid: + mdc_vtx_tracks_extra/is_pion: { equals: 1 } + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# - name: Mf type: track phi: mdc_vtx_tracks_rapidity/phi @@ -94,6 +102,7 @@ hades_analysis: *protons_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# - name: Mb type: track phi: mdc_vtx_tracks_rapidity/phi @@ -110,6 +119,7 @@ hades_analysis: *protons_cuts qa: - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# - name: R1 type: track phi: forward_wall_hits/phi @@ -120,6 +130,7 @@ hades_analysis: - twist-and-rescale cuts: *r1_cuts + ############################################################# - name: R2 type: track phi: forward_wall_hits/phi @@ -130,6 +141,7 @@ hades_analysis: - twist-and-rescale cuts: *r2_cuts + ############################################################# - name: W1 type: track phi: forward_wall_hits/phi @@ -140,6 +152,7 @@ hades_analysis: - twist-and-rescale cuts: *w1_cuts + ############################################################# - name: W2 type: track phi: forward_wall_hits/phi @@ -150,6 +163,7 @@ hades_analysis: - twist-and-rescale cuts: *w2_cuts + ############################################################# - name: W3 type: track phi: forward_wall_hits/phi @@ -164,9 +178,4 @@ hades_analysis: type: psi phi: event_header/fw_angle_plain weight: Ones - norm: m -# - name: wall_bk_corr -# type: psi -# phi: event_header/fw_angle_shift_charge_rotation -# weight: Ones -# norm: m \ No newline at end of file + norm: m \ No newline at end of file diff --git a/setups/hades/correlation-agag-123.yml b/setups/hades/correlation-agag-123.yml index 89dc7ee0..59b75af5 100644 --- a/setups/hades/correlation-agag-123.yml +++ b/setups/hades/correlation-agag-123.yml @@ -1,6 +1,8 @@ _detectors: &detectors - name: protons tags: [ un_vector ] + - name: pions + tags: [ q2_vector ] - name: W1 tags: [ qn_vector ] - name: W2 @@ -26,6 +28,8 @@ _axes: _components: - &sp_components [ x1,y1 ] + - &sp2_components + [ x2,y2 ] - &ep_components [ cos1,sin1 ] @@ -36,12 +40,24 @@ _tasks_args: components: *sp_components correction-steps: [ rescaled ] weight: sumw + - &ta_u2 + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: sumw - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components correction-steps: [ rescaled ] weight: ones + - &ta_q2_sp + query: { tags: { any-in: [ q2_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: ones - &ta_qn_ep query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors @@ -67,6 +83,16 @@ _tasks: weights-type: observable folder: "/SP/uQ" axes: [ *centrality ] + - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u2Q1Q1" + axes: [ *centrality ] + - args: [*ta_u2, *ta_q2_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u2Q2" + axes: [ *centrality ] - args: [*ta_u, *ta_qn_ep] n-samples: 100 weights-type: observable @@ -88,6 +114,11 @@ _tasks: weights-type: reference folder: "/SP/QQ" axes: [ *centrality ] + - args: [*ta_q2_sp, *ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/Q2Q1Q1" + axes: [ *centrality ] - args: [*ta_qn_ep, *ta_qn_ep] n-samples: 100 weights-type: reference diff --git a/setups/hades/correlation-agag-158.yml b/setups/hades/correlation-agag-158.yml index 89dc7ee0..59b75af5 100644 --- a/setups/hades/correlation-agag-158.yml +++ b/setups/hades/correlation-agag-158.yml @@ -1,6 +1,8 @@ _detectors: &detectors - name: protons tags: [ un_vector ] + - name: pions + tags: [ q2_vector ] - name: W1 tags: [ qn_vector ] - name: W2 @@ -26,6 +28,8 @@ _axes: _components: - &sp_components [ x1,y1 ] + - &sp2_components + [ x2,y2 ] - &ep_components [ cos1,sin1 ] @@ -36,12 +40,24 @@ _tasks_args: components: *sp_components correction-steps: [ rescaled ] weight: sumw + - &ta_u2 + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: sumw - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components correction-steps: [ rescaled ] weight: ones + - &ta_q2_sp + query: { tags: { any-in: [ q2_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: ones - &ta_qn_ep query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors @@ -67,6 +83,16 @@ _tasks: weights-type: observable folder: "/SP/uQ" axes: [ *centrality ] + - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u2Q1Q1" + axes: [ *centrality ] + - args: [*ta_u2, *ta_q2_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u2Q2" + axes: [ *centrality ] - args: [*ta_u, *ta_qn_ep] n-samples: 100 weights-type: observable @@ -88,6 +114,11 @@ _tasks: weights-type: reference folder: "/SP/QQ" axes: [ *centrality ] + - args: [*ta_q2_sp, *ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/Q2Q1Q1" + axes: [ *centrality ] - args: [*ta_qn_ep, *ta_qn_ep] n-samples: 100 weights-type: reference From dcb062b39533d2fc4e005fb6ba8126dbf715b52d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 27 Jul 2021 22:24:29 +0300 Subject: [PATCH 171/274] fix --- setups/hades/correction-agag-123.yml | 34 ++++++++++++++-------------- setups/hades/correction-agag-158.yml | 34 ++++++++++++++-------------- setups/hades/mc-correction-debug.yml | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 0a6df7a5..172b74e1 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -2,26 +2,26 @@ _layouts: _axes: - &axis_pT - name: mdc_vtx_tracks_rapidity/pT + name: mdc_vtx_tracks_extra/pT bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity - name: mdc_vtx_tracks_rapidity/ycm + name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 _cuts: - &protons_cuts - mdc_vtx_tracks_rapidity/pid: { equals: 2212 } + mdc_vtx_tracks_extra/pid: { equals: 2212 } - &good_particle_cuts - mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - &mf_cuts - mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_rapidity/rapidity: {range: [1.09, 1.29]} + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} - &mb_cuts - mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_rapidity/rapidity: {range: [0.19, 0.39]} + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} - &r1_cuts forward_wall_hits/rnd_sub: { equals: 0 } forward_wall_hits/time: { range: [22.681788, 28.352235] } @@ -51,8 +51,8 @@ hades_analysis: q-vectors: - name: protons type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering @@ -65,7 +65,7 @@ hades_analysis: cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] @@ -85,7 +85,7 @@ hades_analysis: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - name: Mf type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -98,10 +98,10 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - name: Mb type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -114,7 +114,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - name: R1 type: track phi: forward_wall_hits/phi diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index a10b6eef..dd93f87c 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -2,26 +2,26 @@ _layouts: _axes: - &axis_pT - name: mdc_vtx_tracks_rapidity/pT + name: mdc_vtx_tracks_extra/pT bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - &axis_rapidity - name: mdc_vtx_tracks_rapidity/ycm + name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 _cuts: - &protons_cuts - mdc_vtx_tracks_rapidity/pid: { equals: 2212 } + mdc_vtx_tracks_extra/pid: { equals: 2212 } - &good_particle_cuts - mdc_vtx_tracks_rapidity/dca_xy: {range: [-10.0, 10.0]} - mdc_vtx_tracks_rapidity/dca_z: {range: [-10.0, 10.0]} - mdc_vtx_tracks_rapidity/chi2: {range: [0.0, 100.0]} + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - &mf_cuts - mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_rapidity/rapidity: {range: [1.17, 1.37]} + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.17, 1.37]} - &mb_cuts - mdc_vtx_tracks_rapidity/pT: {range: [0.0, 2.0]} - mdc_vtx_tracks_rapidity/rapidity: {range: [0.27, 0.47]} + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.27, 0.47]} - &r1_cuts forward_wall_hits/rnd_sub: { equals: 0 } forward_wall_hits/time: { range: [22.681788, 28.352235] } @@ -52,8 +52,8 @@ hades_analysis: ############################################################# - name: protons type: track - phi: mdc_vtx_tracks_rapidity/phi - weight: mdc_vtx_tracks_rapidity/efficiency + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering @@ -66,7 +66,7 @@ hades_analysis: cuts-quality: *good_particle_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_pT - *axis_rapidity - [*axis_rapidity, *axis_pT] @@ -88,7 +88,7 @@ hades_analysis: ############################################################# - name: Mf type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -101,11 +101,11 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: Mb type: track - phi: mdc_vtx_tracks_rapidity/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -118,7 +118,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - - {name: mdc_vtx_tracks_rapidity/phi, nb: 100, lo: -4., hi: 4.} + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: R1 type: track diff --git a/setups/hades/mc-correction-debug.yml b/setups/hades/mc-correction-debug.yml index 7e5a0a70..ff674871 100644 --- a/setups/hades/mc-correction-debug.yml +++ b/setups/hades/mc-correction-debug.yml @@ -8,7 +8,7 @@ _axes: hi: 1.49 - &axis_gen_rapidity name: sim_tracks/rapidity - nb: 15 + nb: 1 lo: -0.01 hi: 1.49 - &axis_pT_non_uniform From 8fd65ff02332dbf2d3771e620966fadbabca992a Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 28 Jul 2021 01:01:30 +0300 Subject: [PATCH 172/274] second order correlation --- setups/hades/mc-correlation-all.yml | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/setups/hades/mc-correlation-all.yml b/setups/hades/mc-correlation-all.yml index 4d12b1d7..1b30ead0 100644 --- a/setups/hades/mc-correlation-all.yml +++ b/setups/hades/mc-correlation-all.yml @@ -16,6 +16,8 @@ _axes: _components: - &sp_components [ x1,y1 ] + - &sp2_components + [ x1,y1 ] - &ep_components [ cos1,sin1 ] @@ -26,18 +28,36 @@ _tasks_args: components: *sp_components correction-steps: [ rescaled ] weight: sumw + - &ta_accepted2 + query: { tags: { any-in: [ rec_un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: sumw - &ta_all query: { tags: { any-in: [ gen_un_vector ] } } query-list: *detectors components: *sp_components correction-steps: [ plain ] weight: sumw + - &ta_all2 + query: { tags: { any-in: [ gen_un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: sumw - &ta_psi query: { tags: { any-in: [ psi_vector ] } } query-list: *detectors components: *ep_components correction-steps: [ plain ] weight: ones + - &ta_psi2 + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: ones _tasks: - args: [*ta_accepted, *ta_psi] @@ -45,8 +65,18 @@ _tasks: weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] + - args: [*ta_accepted2, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u2Q2/reco" + axes: [ *centrality ] - args: [*ta_all, *ta_psi] n-samples: 100 weights-type: observable folder: "/uQ/reco" + axes: [ *centrality ] + - args: [*ta_all2, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u2Q2/reco" axes: [ *centrality ] \ No newline at end of file From d490e45d0cc9096181a0936bf1eb3e909112871e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 28 Jul 2021 13:55:33 +0300 Subject: [PATCH 173/274] second order correlations added --- setups/hades/correlation-all.yml | 141 +++++++------------------------ 1 file changed, 29 insertions(+), 112 deletions(-) diff --git a/setups/hades/correlation-all.yml b/setups/hades/correlation-all.yml index 9313c8fa..0549db80 100644 --- a/setups/hades/correlation-all.yml +++ b/setups/hades/correlation-all.yml @@ -7,10 +7,6 @@ _detectors: &detectors tags: [ qn_vector ] - name: W3 tags: [ qn_vector ] - - name: R1 - tags: [ rnd_vector ] - - name: R2 - tags: [ rnd_vector ] - name: Mf tags: [ qn_vector ] - name: Mb @@ -26,120 +22,41 @@ _axes: _components: - &sp_components [ x1,y1 ] - - &ep_components - [ cos1,sin1 ] + - &sp2_components + [ x2,y2 ] +_tasks_args: + - &ta_u + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_u2 + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_qn_sp + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones _tasks: - - args: - - query: { tags: { any-in: [ un_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: sumw - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - weight: ones + - args: [*ta_u, *ta_qn_sp] n-samples: 100 weights-type: observable folder: "/SP/uQ" axes: [ *centrality ] -# - args: -# - query: { tags: { any-in: [ un_vector ] } } -# query-list: *detectors -# components: *sp_components -# correction-steps: [ rescaled ] -# weight: sumw -# - query: { tags: { any-in: [ rnd_vector ] } } -# query-list: *detectors -# components: *sp_components -# correction-steps: [ rescaled ] -# weight: ones -# n-samples: 100 -# weights-type: observable -# folder: "/uQ/SP" -# axes: [ *centrality ] -# - args: -# - query: { tags: { any-in: [ un_vector ] } } -# query-list: *detectors -# components: *sp_components -# correction-steps: [ rescaled ] -# weight: sumw -# - query: { tags: { any-in: [ qn_vector ] } } -# query-list: *detectors -# components: *ep_components # -# correction-steps: [ rescaled ] -# weight: ones -# n-samples: 100 -# weights-type: observable -# folder: "/uQ/EP" -# axes: [ *centrality ] -# - args: -# - query: { tags: { any-in: [ un_vector ] } } -# query-list: *detectors -# components: *sp_components -# correction-steps: [ rescaled ] -# weight: sumw -# - query: { tags: { any-in: [ rnd_vector ] } } -# query-list: *detectors -# components: *ep_components # -# correction-steps: [ rescaled ] -# weight: ones -# n-samples: 100 -# weights-type: observable -# folder: "/uQ/EP" -# axes: [ *centrality ] - # Reference x Reference - - args: - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] - - query: { tags: { any-in: [ qn_vector ] } } - query-list: *detectors - components: *sp_components - correction-steps: [ rescaled ] + - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u2Q1Q1" + axes: [ *centrality ] + - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: reference folder: "/SP/QQ" - axes: [ *centrality ] -# - args: -# - query: { tags: { any-in: [ rnd_vector ] } } -# query-list: *detectors -# components: *sp_components -# correction-steps: [ rescaled ] -# - query: { tags: { any-in: [ rnd_vector ] } } -# query-list: *detectors -# components: *sp_components -# correction-steps: [ rescaled ] -# n-samples: 100 -# weights-type: reference -# folder: "/QQ/SP" -# axes: [ *centrality ] -# - args: -# - query: { tags: { any-in: [ qn_vector ] } } -# query-list: *detectors -# components: *ep_components -# correction-steps: [ rescaled ] -# - query: { tags: { any-in: [ qn_vector ] } } -# query-list: *detectors -# components: *ep_components -# correction-steps: [ rescaled ] -# n-samples: 100 -# weights-type: reference -# folder: "/QQ/EP" -# axes: [ *centrality ] -# - args: -# - query: { tags: { any-in: [ rnd_vector ] } } -# query-list: *detectors -# components: *ep_components -# correction-steps: [ rescaled ] -# - query: { tags: { any-in: [ rnd_vector ] } } -# query-list: *detectors -# components: *ep_components -# correction-steps: [ rescaled ] -# n-samples: 100 -# weights-type: reference -# folder: "/QQ/EP" -# axes: [ *centrality ] \ No newline at end of file + axes: [ *centrality ] \ No newline at end of file From a4ef9985705e92ffa6b5899ec016366e4ada75c1 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 28 Jul 2021 13:57:40 +0300 Subject: [PATCH 174/274] second order correlations added --- setups/hades/mc-correlation-all.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/setups/hades/mc-correlation-all.yml b/setups/hades/mc-correlation-all.yml index 1b30ead0..a60b2a01 100644 --- a/setups/hades/mc-correlation-all.yml +++ b/setups/hades/mc-correlation-all.yml @@ -17,9 +17,7 @@ _components: - &sp_components [ x1,y1 ] - &sp2_components - [ x1,y1 ] - - &ep_components - [ cos1,sin1 ] + [ x2,y2 ] _tasks_args: - &ta_accepted @@ -49,7 +47,7 @@ _tasks_args: - &ta_psi query: { tags: { any-in: [ psi_vector ] } } query-list: *detectors - components: *ep_components + components: *sp_components correction-steps: [ plain ] weight: ones - &ta_psi2 @@ -73,10 +71,10 @@ _tasks: - args: [*ta_all, *ta_psi] n-samples: 100 weights-type: observable - folder: "/uQ/reco" + folder: "/uQ/sim" axes: [ *centrality ] - args: [*ta_all2, *ta_psi2] n-samples: 100 weights-type: observable - folder: "/u2Q2/reco" + folder: "/u2Q2/sim" axes: [ *centrality ] \ No newline at end of file From 1c91a890ec8825aa3bf31dd72f069bc85971a10e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 9 Aug 2021 19:12:08 +0300 Subject: [PATCH 175/274] Theta axis instead of eta First order correlations only --- setups/hades/correction-auau-123.yml | 12 +++++------ setups/hades/correlation-auau-123.yml | 30 +++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 4a82b3f7..f27f9532 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -9,11 +9,11 @@ _axes: nb: 15 lo: -0.75 hi: 0.75 - - &axis_protons_eta - name: mdc_vtx_tracks_extra/eta_cm - nb: 15 - lo: -1.8 - hi: 1.2 + - &axis_protons_theta + name: mdc_vtx_tracks_extra/theta + nb: 12 + lo: 0.3 + hi: 1.5 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -66,7 +66,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity -# - *axis_protons_eta + - *axis_protons_theta cuts-pid: *protons_cuts cuts-quality: diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index c82de839..bb1a073a 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -79,16 +79,16 @@ _tasks: weights-type: observable folder: "/SP/uQ" axes: [ *centrality ] - - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/u2Q1Q1" - axes: [ *centrality ] - - args: [*ta_u2, *ta_q2_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/u2Q2" - axes: [ *centrality ] +# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/u2Q1Q1" +# axes: [ *centrality ] +# - args: [*ta_u2, *ta_q2_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/u2Q2" +# axes: [ *centrality ] - args: [*ta_u, *ta_qn_ep] n-samples: 100 weights-type: observable @@ -100,11 +100,11 @@ _tasks: weights-type: reference folder: "/SP/QQ" axes: [ *centrality ] - - args: [*ta_q2_sp, *ta_qn_sp, *ta_qn_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/Q2Q1Q1" - axes: [ *centrality ] +# - args: [*ta_q2_sp, *ta_qn_sp, *ta_qn_sp] +# n-samples: 100 +# weights-type: reference +# folder: "/SP/Q2Q1Q1" +# axes: [ *centrality ] - args: [*ta_qn_ep, *ta_qn_ep] n-samples: 100 weights-type: reference From d7fc50d0e8fd097dc61b6747047645e37b872a21 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 9 Aug 2021 19:16:43 +0300 Subject: [PATCH 176/274] Theta axis instead of eta --- setups/hades/mc-correction-auau-123.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 91916181..f26ff993 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -12,21 +12,21 @@ _axes: nb: 15 lo: -0.75 hi: 0.75 - - &axis_protons_eta - name: mdc_vtx_tracks_extra/eta_cm - nb: 15 - lo: -1.8 - hi: 1.2 + - &axis_protons_theta + name: mdc_vtx_tracks_extra/theta + nb: 12 + lo: 0.3 + hi: 1.5 - &axis_gen_protons_rapidity name: sim_particles_extra/ycm nb: 15 lo: -0.75 hi: 0.75 - - &axis_gen_protons_eta - name: sim_particles_extra/eta_cm - nb: 15 - lo: -1.8 - hi: 1.2 + - &axis_gen_protons_theta + name: sim_particles_extra/theta + nb: 12 + lo: 0.3 + hi: 1.5 _cuts: - &pid_protons_cut mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -71,7 +71,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity - - *axis_protons_eta + - *axis_protons_theta cuts-pid: *pid_protons_cut cuts-quality: @@ -124,7 +124,7 @@ hades_analysis: axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity - - *axis_gen_protons_eta + - *axis_gen_protons_theta cuts-pid: *gen_prim_protons_cut # cuts-efficiency: From cf72551c2a10ead5b06d4dfc517a25934c9bd0e2 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 9 Aug 2021 19:21:20 +0300 Subject: [PATCH 177/274] Theta axis instead of eta --- setups/hades/correction-auau-123-all.yml | 16 ++++++++-------- setups/hades/mc-correction-auau-123-all.yml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/setups/hades/correction-auau-123-all.yml b/setups/hades/correction-auau-123-all.yml index 4f8cfcc7..46240ef8 100644 --- a/setups/hades/correction-auau-123-all.yml +++ b/setups/hades/correction-auau-123-all.yml @@ -9,11 +9,11 @@ _axes: nb: 15 lo: -0.75 hi: 0.75 - - &axis_protons_eta - name: mdc_vtx_tracks_extra/eta_cm - nb: 15 - lo: -1.8 - hi: 1.2 + - &axis_protons_theta + name: mdc_vtx_tracks_extra/theta + nb: 12 + lo: 0.3 + hi: 1.5 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -50,8 +50,8 @@ hades_analysis: - name: protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency -# weight: Ones +# weight: mdc_vtx_tracks_extra/efficiency + weight: Ones norm: m corrections: - recentering @@ -59,7 +59,7 @@ hades_analysis: axes: # - *axis_protons_pT # - *axis_protons_rapidity - - *axis_protons_eta + - *axis_protons_theta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} qa: diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 0ae72c13..8c723c92 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -57,7 +57,7 @@ hades_analysis: axes: # - *axis_protons_pT # - *axis_protons_rapidity - - *axis_protons_eta + - *axis_protons_theta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} qa: @@ -76,7 +76,7 @@ hades_analysis: axes: # - *axis_gen_protons_pT # - *axis_gen_protons_rapidity - - *axis_gen_protons_eta + - *axis_gen_protons_theta qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT From 0f8b82270de1b3c01dd7dc8a97f9ea61e6a74140 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 11 Aug 2021 13:57:16 +0300 Subject: [PATCH 178/274] Positive and negative pions added --- setups/hades/correction-auau-123.yml | 45 ++++++++++++++++++++++++--- setups/hades/correlation-auau-123.yml | 22 +++---------- 2 files changed, 44 insertions(+), 23 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index f27f9532..778ada3e 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -4,12 +4,20 @@ _axes: - &axis_protons_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 - - &axis_protons_theta + - &axis_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_theta name: mdc_vtx_tracks_extra/theta nb: 12 lo: 0.3 @@ -17,6 +25,10 @@ _axes: _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pi_pos_cuts + mdc_vtx_tracks_extra/pid: { equals: 211 } + - &pi_neg_cuts + mdc_vtx_tracks_extra/pid: { equals: -211 } - &good_particle_cuts mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} @@ -66,7 +78,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity - - *axis_protons_theta + - *axis_theta cuts-pid: *protons_cuts cuts-quality: @@ -77,18 +89,41 @@ hades_analysis: - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# - - name: pions + - name: pi_pos type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering - twist-and-rescale + axes: + - *axis_pions_pT + - *axis_pions_rapidity + - *axis_theta + cuts-quality: + *good_particle_cuts + cuts-pid: + *pi_pos_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: pi_neg + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pions_pT + - *axis_pions_rapidity + - *axis_theta cuts-quality: *good_particle_cuts cuts-pid: - mdc_vtx_tracks_extra/is_pion: { equals: 1 } + *pi_neg_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index bb1a073a..4545cd06 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -1,8 +1,10 @@ _detectors: &detectors - name: protons tags: [ un_vector ] - - name: pions - tags: [ q2_vector ] + - name: pi_pos + tags: [ un_vector ] + - name: pi_neg + tags: [ un_vector ] - name: W1 tags: [ qn_vector ] - name: W2 @@ -48,12 +50,6 @@ _tasks_args: components: *sp_components correction-steps: [ rescaled ] weight: ones - - &ta_q2_sp - query: { tags: { any-in: [ q2_vector ] } } - query-list: *detectors - components: *sp2_components - correction-steps: [ rescaled ] - weight: ones - &ta_qn_ep query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors @@ -83,11 +79,6 @@ _tasks: # n-samples: 100 # weights-type: observable # folder: "/SP/u2Q1Q1" -# axes: [ *centrality ] -# - args: [*ta_u2, *ta_q2_sp] -# n-samples: 100 -# weights-type: observable -# folder: "/SP/u2Q2" # axes: [ *centrality ] - args: [*ta_u, *ta_qn_ep] n-samples: 100 @@ -100,11 +91,6 @@ _tasks: weights-type: reference folder: "/SP/QQ" axes: [ *centrality ] -# - args: [*ta_q2_sp, *ta_qn_sp, *ta_qn_sp] -# n-samples: 100 -# weights-type: reference -# folder: "/SP/Q2Q1Q1" -# axes: [ *centrality ] - args: [*ta_qn_ep, *ta_qn_ep] n-samples: 100 weights-type: reference From f647d633cae1a091d4aa4b2451cc94554884d2b6 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 11 Aug 2021 14:11:38 +0300 Subject: [PATCH 179/274] Positive and negative pions added --- setups/hades/mc-correction-auau-123.yml | 122 ++++++++++++++++++++++-- setups/hades/mc-correlation.yml | 8 ++ 2 files changed, 120 insertions(+), 10 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index f26ff993..1463e98f 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -4,25 +4,41 @@ _axes: - &axis_protons_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] - &axis_gen_protons_pT name: sim_particles_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_gen_pions_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 - - &axis_protons_theta - name: mdc_vtx_tracks_extra/theta - nb: 12 - lo: 0.3 - hi: 1.5 + - &axis_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 - &axis_gen_protons_rapidity name: sim_particles_extra/ycm nb: 15 lo: -0.75 hi: 0.75 - - &axis_gen_protons_theta + - &axis_gen_pions_rapidity + name: sim_particles_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_theta + name: mdc_vtx_tracks_extra/theta + nb: 12 + lo: 0.3 + hi: 1.5 + - &axis_gen_theta name: sim_particles_extra/theta nb: 12 lo: 0.3 @@ -30,6 +46,10 @@ _axes: _cuts: - &pid_protons_cut mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pid_pi_pos_cut + mdc_vtx_tracks_extra/pid: { equals: 211 } + - &pid_pi_neg_cut + mdc_vtx_tracks_extra/pid: { equals: -211 } - &mf_cuts mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} @@ -39,6 +59,12 @@ _cuts: - &gen_prim_protons_cut sim_particles_extra/pid: { equals: 2212 } sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_pos_cut + sim_particles_extra/pid: { equals: 211 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_neg_cut + sim_particles_extra/pid: { equals: -211 } + sim_particles_extra/is_primary: { equals: 1 } - &good_track_cuts mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} @@ -71,7 +97,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity - - *axis_protons_theta + - *axis_theta cuts-pid: *pid_protons_cut cuts-quality: @@ -81,6 +107,50 @@ hades_analysis: - *axis_protons_pT - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] + ########################################################################### + - name: pid_pi_pos + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pions_pT + - *axis_pions_rapidity + - *axis_theta + cuts-pid: + *pid_pi_pos_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_protons_pT + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] + ########################################################################### + - name: pid_pi_neg + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pions_pT + - *axis_pions_rapidity + - *axis_theta + cuts-pid: + *pid_pi_neg_cut + cuts-quality: + *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_protons_pT + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] ########################################################################### - name: Mf type: track @@ -124,11 +194,43 @@ hades_analysis: axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity - - *axis_gen_protons_theta + - *axis_gen_theta cuts-pid: *gen_prim_protons_cut -# cuts-efficiency: -# sim_particles_extra/is_in_high_efficiency: { equals: 1 } + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + ############################################################# + - name: gen_prim_pi_pos + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_gen_pions_pT + - *axis_gen_pions_rapidity + - *axis_gen_theta + cuts-pid: + *gen_prim_pi_pos_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + ############################################################# + - name: gen_prim_pi_neg + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_gen_pions_pT + - *axis_gen_pions_rapidity + - *axis_gen_theta + cuts-pid: + *gen_prim_pi_neg_cut qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index e0e17854..53246f9b 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -1,8 +1,16 @@ _detectors: &detectors - name: pid_protons tags: [ un_vector ] + - name: pid_pi_pos + tags: [ un_vector ] + - name: pid_pi_neg + tags: [ un_vector ] - name: gen_prim_protons tags: [ gen_un_vector ] + - name: gen_prim_pi_pos + tags: [ gen_un_vector ] + - name: gen_prim_pi_neg + tags: [ gen_un_vector ] - name: psi_rp tags: [ psi_vector ] - name: W1 From abeb02b646b2daf735e4752bb08590b704f3eb73 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 12 Aug 2021 13:13:20 +0300 Subject: [PATCH 180/274] protons removed to save memory --- setups/hades/mc-correction-auau-123.yml | 74 ++++++++++++------------- setups/hades/mc-correlation.yml | 8 +-- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 1463e98f..ed473822 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -86,27 +86,27 @@ hades_analysis: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: ########################################################################### - - name: pid_protons - type: track - phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_protons_pT - - *axis_protons_rapidity - - *axis_theta - cuts-pid: - *pid_protons_cut - cuts-quality: - *good_track_cuts - qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_protons_pT - - *axis_protons_rapidity - - [*axis_protons_rapidity, *axis_protons_pT] +# - name: pid_protons +# type: track +# phi: mdc_vtx_tracks_extra/phi +# weight: mdc_vtx_tracks_extra/efficiency +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# axes: +# - *axis_protons_pT +# - *axis_protons_rapidity +# - *axis_theta +# cuts-pid: +# *pid_protons_cut +# cuts-quality: +# *good_track_cuts +# qa: +# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} +# - *axis_protons_pT +# - *axis_protons_rapidity +# - [*axis_protons_rapidity, *axis_protons_pT] ########################################################################### - name: pid_pi_pos type: track @@ -186,22 +186,22 @@ hades_analysis: qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - - name: gen_prim_protons - type: track - phi: sim_particles_extra/phi - weight: Ones - norm: m - axes: - - *axis_gen_protons_pT - - *axis_gen_protons_rapidity - - *axis_gen_theta - cuts-pid: - *gen_prim_protons_cut - qa: - - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_gen_protons_pT - - *axis_gen_protons_rapidity - - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] +# - name: gen_prim_protons +# type: track +# phi: sim_particles_extra/phi +# weight: Ones +# norm: m +# axes: +# - *axis_gen_protons_pT +# - *axis_gen_protons_rapidity +# - *axis_gen_theta +# cuts-pid: +# *gen_prim_protons_cut +# qa: +# - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} +# - *axis_gen_protons_pT +# - *axis_gen_protons_rapidity +# - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] ############################################################# - name: gen_prim_pi_pos type: track diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 53246f9b..1a3eafb8 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -1,12 +1,12 @@ _detectors: &detectors - - name: pid_protons - tags: [ un_vector ] +# - name: pid_protons +# tags: [ un_vector ] - name: pid_pi_pos tags: [ un_vector ] - name: pid_pi_neg tags: [ un_vector ] - - name: gen_prim_protons - tags: [ gen_un_vector ] +# - name: gen_prim_protons +# tags: [ gen_un_vector ] - name: gen_prim_pi_pos tags: [ gen_un_vector ] - name: gen_prim_pi_neg From 3a982bbe125ca5037007419a6cff8067e0edf9b3 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 13 Aug 2021 13:31:51 +0300 Subject: [PATCH 181/274] Single correlation task split into 3 for each particle type --- setups/hades/correlation-auau-123-pi-neg.yml | 94 ++++++++++++++++++++ setups/hades/correlation-auau-123-pi-pos.yml | 94 ++++++++++++++++++++ setups/hades/correlation-auau-123-proton.yml | 94 ++++++++++++++++++++ 3 files changed, 282 insertions(+) create mode 100644 setups/hades/correlation-auau-123-pi-neg.yml create mode 100644 setups/hades/correlation-auau-123-pi-pos.yml create mode 100644 setups/hades/correlation-auau-123-proton.yml diff --git a/setups/hades/correlation-auau-123-pi-neg.yml b/setups/hades/correlation-auau-123-pi-neg.yml new file mode 100644 index 00000000..bec11cf4 --- /dev/null +++ b/setups/hades/correlation-auau-123-pi-neg.yml @@ -0,0 +1,94 @@ +_detectors: &detectors + - name: pi_neg + tags: [ un_vector ] + - name: W1 + tags: [ qn_vector ] + - name: W2 + tags: [ qn_vector ] + - name: W3 + tags: [ qn_vector ] + - name: Mf + tags: [ qn_vector ] + - name: Mb + tags: [ qn_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + - &sp2_components + [ x2,y2 ] + - &ep_components + [ cos1,sin1 ] + +_tasks_args: + - &ta_u + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_u2 + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_qn_sp + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_qn_ep + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + - &ta_rnd_sp + query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_rnd_ep + query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + +_tasks: + - args: [*ta_u, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/uQ" + axes: [ *centrality ] +# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/u2Q1Q1" +# axes: [ *centrality ] + - args: [*ta_u, *ta_qn_ep] + n-samples: 100 + weights-type: observable + folder: "/EP/uQ" + axes: [ *centrality ] + # Reference x Reference + - args: [*ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/QQ" + axes: [ *centrality ] + - args: [*ta_qn_ep, *ta_qn_ep] + n-samples: 100 + weights-type: reference + folder: "/EP/QQ" + axes: [ *centrality ] \ No newline at end of file diff --git a/setups/hades/correlation-auau-123-pi-pos.yml b/setups/hades/correlation-auau-123-pi-pos.yml new file mode 100644 index 00000000..fb445c2d --- /dev/null +++ b/setups/hades/correlation-auau-123-pi-pos.yml @@ -0,0 +1,94 @@ +_detectors: &detectors + - name: pi_pos + tags: [ un_vector ] + - name: W1 + tags: [ qn_vector ] + - name: W2 + tags: [ qn_vector ] + - name: W3 + tags: [ qn_vector ] + - name: Mf + tags: [ qn_vector ] + - name: Mb + tags: [ qn_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + - &sp2_components + [ x2,y2 ] + - &ep_components + [ cos1,sin1 ] + +_tasks_args: + - &ta_u + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_u2 + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_qn_sp + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_qn_ep + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + - &ta_rnd_sp + query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_rnd_ep + query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + +_tasks: + - args: [*ta_u, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/uQ" + axes: [ *centrality ] +# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/u2Q1Q1" +# axes: [ *centrality ] + - args: [*ta_u, *ta_qn_ep] + n-samples: 100 + weights-type: observable + folder: "/EP/uQ" + axes: [ *centrality ] + # Reference x Reference + - args: [*ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/QQ" + axes: [ *centrality ] + - args: [*ta_qn_ep, *ta_qn_ep] + n-samples: 100 + weights-type: reference + folder: "/EP/QQ" + axes: [ *centrality ] \ No newline at end of file diff --git a/setups/hades/correlation-auau-123-proton.yml b/setups/hades/correlation-auau-123-proton.yml new file mode 100644 index 00000000..29880082 --- /dev/null +++ b/setups/hades/correlation-auau-123-proton.yml @@ -0,0 +1,94 @@ +_detectors: &detectors + - name: protons + tags: [ un_vector ] + - name: W1 + tags: [ qn_vector ] + - name: W2 + tags: [ qn_vector ] + - name: W3 + tags: [ qn_vector ] + - name: Mf + tags: [ qn_vector ] + - name: Mb + tags: [ qn_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + - &sp2_components + [ x2,y2 ] + - &ep_components + [ cos1,sin1 ] + +_tasks_args: + - &ta_u + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_u2 + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_qn_sp + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_qn_ep + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + - &ta_rnd_sp + query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: ones + - &ta_rnd_ep + query: { tags: { any-in: [ rnd_vector ] } } + query-list: *detectors + components: *ep_components + correction-steps: [ rescaled ] + weight: ones + +_tasks: + - args: [*ta_u, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/uQ" + axes: [ *centrality ] +# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/u2Q1Q1" +# axes: [ *centrality ] + - args: [*ta_u, *ta_qn_ep] + n-samples: 100 + weights-type: observable + folder: "/EP/uQ" + axes: [ *centrality ] + # Reference x Reference + - args: [*ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/QQ" + axes: [ *centrality ] + - args: [*ta_qn_ep, *ta_qn_ep] + n-samples: 100 + weights-type: reference + folder: "/EP/QQ" + axes: [ *centrality ] \ No newline at end of file From 868c5c1fdbae0b63de05cbb2c6d1253241e60544 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 13 Aug 2021 13:57:35 +0300 Subject: [PATCH 182/274] Single correlation task split into 4 for each particle type --- setups/hades/mc-correlation-gen-pi-neg.yml | 37 ++++++++++++++++++++++ setups/hades/mc-correlation-gen-pi-pos.yml | 37 ++++++++++++++++++++++ setups/hades/mc-correlation-rec-pi-neg.yml | 37 ++++++++++++++++++++++ setups/hades/mc-correlation-rec-pi-pos.yml | 37 ++++++++++++++++++++++ 4 files changed, 148 insertions(+) create mode 100644 setups/hades/mc-correlation-gen-pi-neg.yml create mode 100644 setups/hades/mc-correlation-gen-pi-pos.yml create mode 100644 setups/hades/mc-correlation-rec-pi-neg.yml create mode 100644 setups/hades/mc-correlation-rec-pi-pos.yml diff --git a/setups/hades/mc-correlation-gen-pi-neg.yml b/setups/hades/mc-correlation-gen-pi-neg.yml new file mode 100644 index 00000000..9000ff39 --- /dev/null +++ b/setups/hades/mc-correlation-gen-pi-neg.yml @@ -0,0 +1,37 @@ +_detectors: &detectors + - name: gen_prim_pi_neg + tags: [ un_vector ] + - name: psi_rp + tags: [ psi_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + +_tasks_args: + - &ta_gen + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_gen, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/uQ/gen" + axes: [ *centrality ] \ No newline at end of file diff --git a/setups/hades/mc-correlation-gen-pi-pos.yml b/setups/hades/mc-correlation-gen-pi-pos.yml new file mode 100644 index 00000000..6e4ced20 --- /dev/null +++ b/setups/hades/mc-correlation-gen-pi-pos.yml @@ -0,0 +1,37 @@ +_detectors: &detectors + - name: gen_prim_pi_pos + tags: [ un_vector ] + - name: psi_rp + tags: [ psi_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + +_tasks_args: + - &ta_gen + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_gen, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/uQ/gen" + axes: [ *centrality ] \ No newline at end of file diff --git a/setups/hades/mc-correlation-rec-pi-neg.yml b/setups/hades/mc-correlation-rec-pi-neg.yml new file mode 100644 index 00000000..b851d853 --- /dev/null +++ b/setups/hades/mc-correlation-rec-pi-neg.yml @@ -0,0 +1,37 @@ +_detectors: &detectors + - name: pid_pi_neg + tags: [ un_vector ] + - name: psi_rp + tags: [ psi_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + +_tasks_args: + - &ta_reco + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_reco, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/uQ/reco" + axes: [ *centrality ] \ No newline at end of file diff --git a/setups/hades/mc-correlation-rec-pi-pos.yml b/setups/hades/mc-correlation-rec-pi-pos.yml new file mode 100644 index 00000000..811d79ce --- /dev/null +++ b/setups/hades/mc-correlation-rec-pi-pos.yml @@ -0,0 +1,37 @@ +_detectors: &detectors + - name: pid_pi_pos + tags: [ un_vector ] + - name: psi_rp + tags: [ psi_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + +_tasks_args: + - &ta_reco + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ rescaled ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_reco, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/uQ/reco" + axes: [ *centrality ] \ No newline at end of file From 7632209818c6b55125c27fb364d1adcffba27f76 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 17 Aug 2021 14:37:19 +0300 Subject: [PATCH 183/274] setups for theta-cut influence on flow research --- setups/hades/mc-correction-auau-123-true.yml | 146 +++++++++++++++++++ setups/hades/mc-correlation-true.yml | 65 +++++++++ 2 files changed, 211 insertions(+) create mode 100644 setups/hades/mc-correction-auau-123-true.yml create mode 100644 setups/hades/mc-correlation-true.yml diff --git a/setups/hades/mc-correction-auau-123-true.yml b/setups/hades/mc-correction-auau-123-true.yml new file mode 100644 index 00000000..87554442 --- /dev/null +++ b/setups/hades/mc-correction-auau-123-true.yml @@ -0,0 +1,146 @@ +_layouts: + +_axes: + - &axis_gen_protons_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_gen_pions_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] + - &axis_gen_protons_rapidity + name: sim_particles_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_gen_pions_rapidity + name: sim_particles_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 +_cuts: + - &gen_prim_protons_cut + sim_particles_extra/pid: { equals: 2212 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_pos_cut + sim_particles_extra/pid: { equals: 211 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_neg_cut + sim_particles_extra/pid: { equals: -211 } + sim_particles_extra/is_primary: { equals: 1 } + - &theta_cut + sim_particles_extra/theta: { range: [0.3, 1.5] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: + ############################################################# + - name: proton + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + cuts-pid: + *gen_prim_protons_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + ############################################################# + - name: proton_theta + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + cuts-pid: + *gen_prim_protons_cut + cuts-theta: + *theta_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + ############################################################# + - name: pi_pos + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_gen_pions_pT + - *axis_gen_pions_rapidity + cuts-pid: + *gen_prim_pi_pos_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + ############################################################# + - name: pi_pos_theta + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_gen_pions_pT + - *axis_gen_pions_rapidity + cuts-pid: + *gen_prim_pi_pos_cut + cuts-theta: + *theta_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + ############################################################# + - name: pi_neg + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_gen_pions_pT + - *axis_gen_pions_rapidity + cuts-pid: + *gen_prim_pi_neg_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + ############################################################# + - name: pi_neg_theta + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_gen_pions_pT + - *axis_gen_pions_rapidity + cuts-pid: + *gen_prim_pi_neg_cut + cuts-theta: + *theta_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] + ########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag \ No newline at end of file diff --git a/setups/hades/mc-correlation-true.yml b/setups/hades/mc-correlation-true.yml new file mode 100644 index 00000000..4f5c84a7 --- /dev/null +++ b/setups/hades/mc-correlation-true.yml @@ -0,0 +1,65 @@ +_detectors: &detectors + - name: proton + tags: [ gen_un_vector ] + - name: proton_theta + tags: [ gen_un_vector ] + - name: pi_pos + tags: [ gen_un_vector ] + - name: pi_pos_theta + tags: [ gen_un_vector ] + - name: pi_neg + tags: [ gen_un_vector ] + - name: pi_neg_theta + tags: [ gen_un_vector ] + - name: psi_rp + tags: [ psi_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 12 + lo: 0 + hi: 60 + +_components: + - &sp_components + [ x1,y1 ] + - &sp2_components + [ x2,y2 ] + +_tasks_args: + - &ta_sim + query: { tags: { any-in: [ gen_un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + - &ta_sim2 + query: { tags: { any-in: [ gen_un_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + - &ta_psi2 + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_sim, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/uQ/gen" + axes: [ *centrality ] + - args: [*ta_sim2, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u2Q2/gen" + axes: [ *centrality ] \ No newline at end of file From 1f0b657e4da10f426be1d0dc0e300a08dc8e56c6 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 18 Aug 2021 19:39:32 +0300 Subject: [PATCH 184/274] theta axis removed --- setups/hades/correction-auau-123.yml | 6 +++--- setups/hades/correlation-auau-123.yml | 23 ++++++++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 778ada3e..a11741a2 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -78,7 +78,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity - - *axis_theta +# - *axis_theta cuts-pid: *protons_cuts cuts-quality: @@ -100,7 +100,7 @@ hades_analysis: axes: - *axis_pions_pT - *axis_pions_rapidity - - *axis_theta +# - *axis_theta cuts-quality: *good_particle_cuts cuts-pid: @@ -119,7 +119,7 @@ hades_analysis: axes: - *axis_pions_pT - *axis_pions_rapidity - - *axis_theta +# - *axis_theta cuts-quality: *good_particle_cuts cuts-pid: diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 4545cd06..c4fcb12d 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -12,9 +12,9 @@ _detectors: &detectors - name: W3 tags: [ qn_vector ] - name: Mf - tags: [ qn_vector ] + tags: [ qn_vector, mdc ] - name: Mb - tags: [ qn_vector ] + tags: [ qn_vector, mdc ] _axes: - ¢rality @@ -38,8 +38,8 @@ _tasks_args: components: *sp_components correction-steps: [ rescaled ] weight: sumw - - &ta_u2 - query: { tags: { any-in: [ un_vector ] } } + - &ta_mdc2 + query: { tags: { any-in: [ mdc ] } } query-list: *detectors components: *sp2_components correction-steps: [ rescaled ] @@ -75,11 +75,11 @@ _tasks: weights-type: observable folder: "/SP/uQ" axes: [ *centrality ] -# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] -# n-samples: 100 -# weights-type: observable -# folder: "/SP/u2Q1Q1" -# axes: [ *centrality ] + - args: [*ta_u, *ta_mdc2, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u1Q2Q1" + axes: [ *centrality ] - args: [*ta_u, *ta_qn_ep] n-samples: 100 weights-type: observable @@ -91,6 +91,11 @@ _tasks: weights-type: reference folder: "/SP/QQ" axes: [ *centrality ] + - args: [*ta_mdc2, *ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/Q2Q1Q1" + axes: [ *centrality ] - args: [*ta_qn_ep, *ta_qn_ep] n-samples: 100 weights-type: reference From 6b6aac89fc7efd5a2f3842ee7fadea751b7c5b02 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 18 Aug 2021 19:40:17 +0300 Subject: [PATCH 185/274] renewed --- setups/observables-all.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/setups/observables-all.yml b/setups/observables-all.yml index ada6eeff..ab5fed7f 100644 --- a/setups/observables-all.yml +++ b/setups/observables-all.yml @@ -22,14 +22,14 @@ _detectors: &detectors _observables: - method: three-sub-event - QQ-directory: QQ/SP - uQ-directory: uQ/SP + QQ-directory: SP/QQ + uQ-directory: SP/uQ u-vector: {name: protons, components: [x1, y1], correction-step: RESCALED} EP-vectors: ep-vectors resolution-vectors: res-vectors - - method: three-sub-event - QQ-directory: QQ/SP - uQ-directory: uQ/SP - u-vector: {name: pions, components: [x1, y1], correction-step: RESCALED} - EP-vectors: ep-vectors - resolution-vectors: res-vectors \ No newline at end of file +# - method: three-sub-event +# QQ-directory: QQ/SP +# uQ-directory: uQ/SP +# u-vector: {name: pions, components: [x1, y1], correction-step: RESCALED} +# EP-vectors: ep-vectors +# resolution-vectors: res-vectors \ No newline at end of file From 6713a149a6e971992fa4de8aae1fcb9446f576f1 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 18 Aug 2021 19:41:56 +0300 Subject: [PATCH 186/274] Only 3 particles correlations --- setups/hades/correlation-auau-123.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index c4fcb12d..4eed6cd4 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -70,11 +70,11 @@ _tasks_args: weight: ones _tasks: - - args: [*ta_u, *ta_qn_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/uQ" - axes: [ *centrality ] +# - args: [*ta_u, *ta_qn_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/uQ" +# axes: [ *centrality ] - args: [*ta_u, *ta_mdc2, *ta_qn_sp] n-samples: 100 weights-type: observable From 4fbf93d5b6d620f985350572d4ff9e6062bf0ddb Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 19 Aug 2021 01:47:19 +0300 Subject: [PATCH 187/274] 2 particles correlations Protons in mdc removed --- setups/hades/correction-auau-123.yml | 6 +++--- setups/hades/correlation-auau-123.yml | 14 ++------------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index a11741a2..ab5f3251 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -50,15 +50,15 @@ _cuts: - &w1_cuts forward_wall_hits/ring: { range: [1.0, 5.0] } forward_wall_hits/beta: { range: [0.84, 1.0] } - forward_wall_hits/signal: { range: [80.0, 999.0] } + forward_wall_hits/signal: { range: [120.0, 999.0] } - &w2_cuts forward_wall_hits/ring: { range: [6.0, 7.0] } forward_wall_hits/beta: { range: [0.85, 1.0] } - forward_wall_hits/signal: { range: [85.0, 999.0] } + forward_wall_hits/signal: { range: [120.0, 999.0] } - &w3_cuts forward_wall_hits/ring: { range: [8.0, 10.0] } forward_wall_hits/beta: { range: [0.80, 1.0] } - forward_wall_hits/signal: { range: [88.0, 999.0] } + forward_wall_hits/signal: { range: [120.0, 999.0] } hades_analysis: event-variables: diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 4eed6cd4..1117c7c0 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -70,15 +70,10 @@ _tasks_args: weight: ones _tasks: -# - args: [*ta_u, *ta_qn_sp] -# n-samples: 100 -# weights-type: observable -# folder: "/SP/uQ" -# axes: [ *centrality ] - - args: [*ta_u, *ta_mdc2, *ta_qn_sp] + - args: [*ta_u, *ta_qn_sp] n-samples: 100 weights-type: observable - folder: "/SP/u1Q2Q1" + folder: "/SP/uQ" axes: [ *centrality ] - args: [*ta_u, *ta_qn_ep] n-samples: 100 @@ -91,11 +86,6 @@ _tasks: weights-type: reference folder: "/SP/QQ" axes: [ *centrality ] - - args: [*ta_mdc2, *ta_qn_sp, *ta_qn_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/Q2Q1Q1" - axes: [ *centrality ] - args: [*ta_qn_ep, *ta_qn_ep] n-samples: 100 weights-type: reference From 453fb7ef9b8e2db36a5e06a2968b5366eb33fcc2 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 21 Aug 2021 01:57:16 +0300 Subject: [PATCH 188/274] Checkin og there is the contribution of v2 to v1 --- setups/hades/correction-auau-123.yml | 6 +++--- setups/hades/correlation-auau-123.yml | 23 ++++++++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index ab5f3251..a11741a2 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -50,15 +50,15 @@ _cuts: - &w1_cuts forward_wall_hits/ring: { range: [1.0, 5.0] } forward_wall_hits/beta: { range: [0.84, 1.0] } - forward_wall_hits/signal: { range: [120.0, 999.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } - &w2_cuts forward_wall_hits/ring: { range: [6.0, 7.0] } forward_wall_hits/beta: { range: [0.85, 1.0] } - forward_wall_hits/signal: { range: [120.0, 999.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } - &w3_cuts forward_wall_hits/ring: { range: [8.0, 10.0] } forward_wall_hits/beta: { range: [0.80, 1.0] } - forward_wall_hits/signal: { range: [120.0, 999.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } hades_analysis: event-variables: diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 1117c7c0..13d99c8b 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -38,8 +38,8 @@ _tasks_args: components: *sp_components correction-steps: [ rescaled ] weight: sumw - - &ta_mdc2 - query: { tags: { any-in: [ mdc ] } } + - &ta_u2 + query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp2_components correction-steps: [ rescaled ] @@ -75,19 +75,24 @@ _tasks: weights-type: observable folder: "/SP/uQ" axes: [ *centrality ] - - args: [*ta_u, *ta_qn_ep] + - args: [*ta_u2, *ta_qn_sp] n-samples: 100 weights-type: observable - folder: "/EP/uQ" + folder: "/SP/u2Q1" axes: [ *centrality ] +# - args: [*ta_u, *ta_qn_ep] +# n-samples: 100 +# weights-type: observable +# folder: "/EP/uQ" +# axes: [ *centrality ] # Reference x Reference - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: reference folder: "/SP/QQ" axes: [ *centrality ] - - args: [*ta_qn_ep, *ta_qn_ep] - n-samples: 100 - weights-type: reference - folder: "/EP/QQ" - axes: [ *centrality ] \ No newline at end of file +# - args: [*ta_qn_ep, *ta_qn_ep] +# n-samples: 100 +# weights-type: reference +# folder: "/EP/QQ" +# axes: [ *centrality ] \ No newline at end of file From 62ef8a9ff1f0efa0c0f30b9387b0948432af2287 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 2 Sep 2021 13:52:19 +0300 Subject: [PATCH 189/274] U2 and Q1 correlations added --- setups/hades/mc-correction-auau-123.yml | 212 ++++++++++++------------ setups/hades/mc-correlation.yml | 46 +++-- 2 files changed, 134 insertions(+), 124 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index ed473822..0ac51193 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -86,29 +86,7 @@ hades_analysis: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: ########################################################################### -# - name: pid_protons -# type: track -# phi: mdc_vtx_tracks_extra/phi -# weight: mdc_vtx_tracks_extra/efficiency -# norm: m -# corrections: -# - recentering -# - twist-and-rescale -# axes: -# - *axis_protons_pT -# - *axis_protons_rapidity -# - *axis_theta -# cuts-pid: -# *pid_protons_cut -# cuts-quality: -# *good_track_cuts -# qa: -# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} -# - *axis_protons_pT -# - *axis_protons_rapidity -# - [*axis_protons_rapidity, *axis_protons_pT] - ########################################################################### - - name: pid_pi_pos + - name: pid_protons type: track phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/efficiency @@ -117,11 +95,11 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pions_pT - - *axis_pions_rapidity - - *axis_theta + - *axis_protons_pT + - *axis_protons_rapidity +# - *axis_theta cuts-pid: - *pid_pi_pos_cut + *pid_protons_cut cuts-quality: *good_track_cuts qa: @@ -129,8 +107,8 @@ hades_analysis: - *axis_protons_pT - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] - ########################################################################### - - name: pid_pi_neg + ########################################################################## + - name: pid_pi_pos type: track phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/efficiency @@ -141,9 +119,9 @@ hades_analysis: axes: - *axis_pions_pT - *axis_pions_rapidity - - *axis_theta +# - *axis_theta cuts-pid: - *pid_pi_neg_cut + *pid_pi_pos_cut cuts-quality: *good_track_cuts qa: @@ -151,57 +129,79 @@ hades_analysis: - *axis_protons_pT - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] - ########################################################################### - - name: Mf + ########################################################################### + - name: pid_pi_neg type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering - twist-and-rescale - cuts-subevent: - *mf_cuts - cuts-quality: - *good_track_cuts + axes: + - *axis_pions_pT + - *axis_pions_rapidity +# - *axis_theta cuts-pid: - *pid_protons_cut - qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - ############################################################# - - name: Mb - type: track - phi: mdc_vtx_tracks_extra/phi - weight: Ones - norm: m - corrections: - - recentering - - twist-and-rescale - cuts-subevent: - *mb_cuts + *pid_pi_neg_cut cuts-quality: *good_track_cuts - cuts-pid: - *pid_protons_cut qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - ############################################################# -# - name: gen_prim_protons + - *axis_protons_pT + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] +# ########################################################################### +# - name: Mf # type: track -# phi: sim_particles_extra/phi +# phi: mdc_vtx_tracks_extra/phi # weight: Ones # norm: m -# axes: -# - *axis_gen_protons_pT -# - *axis_gen_protons_rapidity -# - *axis_gen_theta +# corrections: +# - recentering +# - twist-and-rescale +# cuts-subevent: +# *mf_cuts +# cuts-quality: +# *good_track_cuts +# cuts-pid: +# *pid_protons_cut +# qa: +# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} +# ############################################################# +# - name: Mb +# type: track +# phi: mdc_vtx_tracks_extra/phi +# weight: Ones +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts-subevent: +# *mb_cuts +# cuts-quality: +# *good_track_cuts # cuts-pid: -# *gen_prim_protons_cut +# *pid_protons_cut # qa: -# - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} -# - *axis_gen_protons_pT -# - *axis_gen_protons_rapidity -# - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] +# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: gen_prim_protons + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity +# - *axis_gen_theta + cuts-pid: + *gen_prim_protons_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_gen_protons_pT + - *axis_gen_protons_rapidity + - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] ############################################################# - name: gen_prim_pi_pos type: track @@ -211,7 +211,7 @@ hades_analysis: axes: - *axis_gen_pions_pT - *axis_gen_pions_rapidity - - *axis_gen_theta +# - *axis_gen_theta cuts-pid: *gen_prim_pi_pos_cut qa: @@ -228,7 +228,7 @@ hades_analysis: axes: - *axis_gen_pions_pT - *axis_gen_pions_rapidity - - *axis_gen_theta +# - *axis_gen_theta cuts-pid: *gen_prim_pi_neg_cut qa: @@ -237,44 +237,44 @@ hades_analysis: - *axis_gen_protons_rapidity - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] ########################################################################### - - name: W1 - type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal - norm: m - corrections: - - recentering - - twist-and-rescale - cuts-w1: - *w1_cuts - qa: - - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} - ########################################################################### - - name: W2 - type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal - norm: m - corrections: - - recentering - - twist-and-rescale - cuts-w2: - *w2_cuts - qa: - - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} - ########################################################################### - - name: W3 - type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal - norm: m - corrections: - - recentering - - twist-and-rescale - cuts-w3: - *w3_cuts - qa: - - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} +# - name: W1 +# type: track +# phi: forward_wall_hits/phi +# weight: forward_wall_hits/signal +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts-w1: +# *w1_cuts +# qa: +# - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} +# ########################################################################### +# - name: W2 +# type: track +# phi: forward_wall_hits/phi +# weight: forward_wall_hits/signal +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts-w2: +# *w2_cuts +# qa: +# - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} +# ########################################################################### +# - name: W3 +# type: track +# phi: forward_wall_hits/phi +# weight: forward_wall_hits/signal +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts-w3: +# *w3_cuts +# qa: +# - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} ########################################################################### - name: psi_rp type: psi diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 1a3eafb8..96b53ff3 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -1,12 +1,12 @@ _detectors: &detectors -# - name: pid_protons -# tags: [ un_vector ] + - name: pid_protons + tags: [ un_vector ] - name: pid_pi_pos tags: [ un_vector ] - name: pid_pi_neg tags: [ un_vector ] -# - name: gen_prim_protons -# tags: [ gen_un_vector ] + - name: gen_prim_protons + tags: [ gen_un_vector ] - name: gen_prim_pi_pos tags: [ gen_un_vector ] - name: gen_prim_pi_neg @@ -86,33 +86,43 @@ _tasks: weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] - - args: [*ta_reco2, *ta_psi2] + - args: [*ta_reco2, *ta_psi] n-samples: 100 weights-type: observable - folder: "/u2Q2/reco" + folder: "/u2Q1/reco" axes: [ *centrality ] - - args: [*ta_reco, *ta_qn] + - args: [*ta_reco2, *ta_psi2] n-samples: 100 weights-type: observable - folder: "/uQ/reco" + folder: "/u2Q2/reco" axes: [ *centrality ] +# - args: [*ta_reco, *ta_qn] +# n-samples: 100 +# weights-type: observable +# folder: "/uQ/reco" +# axes: [ *centrality ] - args: [*ta_sim, *ta_psi] n-samples: 100 weights-type: observable folder: "/uQ/gen" axes: [ *centrality ] - - args: [*ta_sim2, *ta_psi2] + - args: [*ta_sim2, *ta_psi] n-samples: 100 weights-type: observable - folder: "/u2Q2/gen" + folder: "/u2Q1/gen" axes: [ *centrality ] - - args: [*ta_qn, *ta_psi] + - args: [*ta_sim2, *ta_psi2] n-samples: 100 - weights-type: reference - folder: "/QQ" + weights-type: observable + folder: "/u2Q2/gen" axes: [ *centrality ] - - args: [*ta_qn, *ta_qn] - n-samples: 100 - weights-type: reference - folder: "/QQ" - axes: [ *centrality ] \ No newline at end of file +# - args: [*ta_qn, *ta_psi] +# n-samples: 100 +# weights-type: reference +# folder: "/QQ" +# axes: [ *centrality ] +# - args: [*ta_qn, *ta_qn] +# n-samples: 100 +# weights-type: reference +# folder: "/QQ" +# axes: [ *centrality ] \ No newline at end of file From 3d3c84842db1a9180c2dfbc335a726443ac4b49e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 10 Sep 2021 21:58:07 +0200 Subject: [PATCH 190/274] Meta writing removed New correlation setup --- setups/hades/correlation-auau-123.yml | 59 ++++++++++++------- .../CorrelationTaskRunner.cpp | 2 +- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 13d99c8b..d1c3bd23 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -36,63 +36,80 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - &ta_u2 query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp2_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: ones - &ta_qn_ep query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *ep_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: ones - &ta_rnd_sp query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: ones - &ta_rnd_ep query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors components: *ep_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: ones _tasks: + # Checks + - args: [*ta_u] + n-samples: 100 + weights-type: observable + folder: "/checks/u1" + axes: [ *centrality ] + - args: [*ta_u2] + n-samples: 100 + weights-type: observable + folder: "/checks/u2" + axes: [ *centrality ] + # Scalar product - args: [*ta_u, *ta_qn_sp] n-samples: 100 weights-type: observable - folder: "/SP/uQ" + folder: "/SP/u1Q1" axes: [ *centrality ] - - args: [*ta_u2, *ta_qn_sp] + - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: observable - folder: "/SP/u2Q1" + folder: "/SP/u2Q1Q1" axes: [ *centrality ] -# - args: [*ta_u, *ta_qn_ep] -# n-samples: 100 -# weights-type: observable -# folder: "/EP/uQ" -# axes: [ *centrality ] - # Reference x Reference - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: reference - folder: "/SP/QQ" + folder: "/SP/Q1Q1" + axes: [ *centrality ] + # Event plane + - args: [*ta_u, *ta_qn_ep] + n-samples: 100 + weights-type: observable + folder: "/EP/u1Q1" axes: [ *centrality ] -# - args: [*ta_qn_ep, *ta_qn_ep] -# n-samples: 100 -# weights-type: reference -# folder: "/EP/QQ" -# axes: [ *centrality ] \ No newline at end of file + - args: [*ta_u2, *ta_qn_ep, *ta_qn_ep] + n-samples: 100 + weights-type: observable + folder: "/EP/u2Q1Q1" + axes: [ *centrality ] + - args: [*ta_qn_ep, *ta_qn_ep] + n-samples: 100 + weights-type: reference + folder: "/EP/Q1Q1" + axes: [ *centrality ] \ No newline at end of file diff --git a/src/QnAnalysisCorrelate/CorrelationTaskRunner.cpp b/src/QnAnalysisCorrelate/CorrelationTaskRunner.cpp index c5ee9643..30a09969 100644 --- a/src/QnAnalysisCorrelate/CorrelationTaskRunner.cpp +++ b/src/QnAnalysisCorrelate/CorrelationTaskRunner.cpp @@ -63,7 +63,7 @@ void Qn::Analysis::Correlate::CorrelationTaskRunner::Run() { container_meta.String() = GenCorrelationMeta(correlation); dir->WriteObject(&container, correlation.meta_key.c_str()); - dir->WriteObject(&container_meta, (correlation.meta_key + "_meta").c_str()); +// dir->WriteObject(&container_meta, (correlation.meta_key + "_meta").c_str()); } } From ac391d09421a96fc11da3fcbcfe68dc269570be0 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 10 Sep 2021 22:52:26 +0200 Subject: [PATCH 191/274] Rescaled vectors are to be processed --- setups/hades/correlation-auau-123.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index d1c3bd23..cd98fd4a 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -36,37 +36,37 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: sumw - &ta_u2 query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp2_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: sumw - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: ones - &ta_qn_ep query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *ep_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: ones - &ta_rnd_sp query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: ones - &ta_rnd_ep query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors components: *ep_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: ones _tasks: From 79cc8a7e77629695426ef7da43781c11b3d006c8 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 11 Sep 2021 13:29:35 +0200 Subject: [PATCH 192/274] Event plane method removed to save cpu time --- setups/hades/correlation-auau-123.yml | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index cd98fd4a..28896155 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -98,18 +98,18 @@ _tasks: folder: "/SP/Q1Q1" axes: [ *centrality ] # Event plane - - args: [*ta_u, *ta_qn_ep] - n-samples: 100 - weights-type: observable - folder: "/EP/u1Q1" - axes: [ *centrality ] - - args: [*ta_u2, *ta_qn_ep, *ta_qn_ep] - n-samples: 100 - weights-type: observable - folder: "/EP/u2Q1Q1" - axes: [ *centrality ] - - args: [*ta_qn_ep, *ta_qn_ep] - n-samples: 100 - weights-type: reference - folder: "/EP/Q1Q1" - axes: [ *centrality ] \ No newline at end of file +# - args: [*ta_u, *ta_qn_ep] +# n-samples: 100 +# weights-type: observable +# folder: "/EP/u1Q1" +# axes: [ *centrality ] +# - args: [*ta_u2, *ta_qn_ep, *ta_qn_ep] +# n-samples: 100 +# weights-type: observable +# folder: "/EP/u2Q1Q1" +# axes: [ *centrality ] +# - args: [*ta_qn_ep, *ta_qn_ep] +# n-samples: 100 +# weights-type: reference +# folder: "/EP/Q1Q1" +# axes: [ *centrality ] \ No newline at end of file From 3f45c0b50b9ec345e831d9d395940401fe55b381 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 13 Sep 2021 21:07:48 +0200 Subject: [PATCH 193/274] Correlation of plain Q-vectors --- setups/hades/correlation-auau-123.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 28896155..f43db1f8 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -36,37 +36,37 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - &ta_u2 query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp2_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: ones - &ta_qn_ep query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *ep_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: ones - &ta_rnd_sp query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: ones - &ta_rnd_ep query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors components: *ep_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: ones _tasks: From 56c7873c6aa060ec0a580b566101e79c80425afe Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 14 Sep 2021 18:09:26 +0200 Subject: [PATCH 194/274] Only checks will be proceeded --- setups/hades/correlation-auau-123.yml | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index f43db1f8..ad54299b 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -82,21 +82,21 @@ _tasks: folder: "/checks/u2" axes: [ *centrality ] # Scalar product - - args: [*ta_u, *ta_qn_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/u1Q1" - axes: [ *centrality ] - - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/u2Q1Q1" - axes: [ *centrality ] - - args: [*ta_qn_sp, *ta_qn_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/Q1Q1" - axes: [ *centrality ] +# - args: [*ta_u, *ta_qn_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/u1Q1" +# axes: [ *centrality ] +# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/u2Q1Q1" +# axes: [ *centrality ] +# - args: [*ta_qn_sp, *ta_qn_sp] +# n-samples: 100 +# weights-type: reference +# folder: "/SP/Q1Q1" +# axes: [ *centrality ] # Event plane # - args: [*ta_u, *ta_qn_ep] # n-samples: 100 From 580e2cf496b5e1597e3bb81ce9dc37290a3e9b5d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 15 Sep 2021 19:59:02 +0200 Subject: [PATCH 195/274] Pions added --- setups/hades/correction-agag-123.yml | 56 +++++++++++++++--- setups/hades/correction-agag-158.yml | 56 +++++++++++++++--- setups/hades/correlation-agag-123.yml | 82 ++++++++------------------- setups/hades/correlation-agag-158.yml | 65 +++------------------ 4 files changed, 127 insertions(+), 132 deletions(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 172b74e1..7f3b1229 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -1,17 +1,29 @@ _layouts: _axes: - - &axis_pT + - &axis_protons_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - - &axis_rapidity + - &axis_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] + - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 + - &axis_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pi_pos_cuts + mdc_vtx_tracks_extra/pid: { equals: 211 } + - &pi_neg_cuts + mdc_vtx_tracks_extra/pid: { equals: -211 } - &good_particle_cuts mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} @@ -58,18 +70,18 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT - - *axis_rapidity + - *axis_protons_pT + - *axis_protons_rapidity cuts-pid: *protons_cuts cuts-quality: *good_particle_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT - - *axis_rapidity - - [*axis_rapidity, *axis_pT] - - name: pions + - *axis_protons_pT + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] + - name: pi_pos type: track phi: mdc_vtx_tracks_extra/phi weight: Ones @@ -77,12 +89,38 @@ hades_analysis: corrections: - recentering - twist-and-rescale + axes: + - *axis_pions_pT + - *axis_pions_rapidity + cuts-pid: + *pi_pos_cuts cuts-quality: *good_particle_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pions_pT + - *axis_pions_rapidity + - [*axis_pions_rapidity, *axis_pions_pT] + - name: pi_neg + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pions_pT + - *axis_pions_rapidity cuts-pid: - mdc_vtx_tracks_extra/is_pion: { equals: 1 } + *pi_neg_cuts + cuts-quality: + *good_particle_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pions_pT + - *axis_pions_rapidity + - [*axis_pions_rapidity, *axis_pions_pT] - name: Mf type: track phi: mdc_vtx_tracks_extra/phi diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index dd93f87c..95530f63 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -1,17 +1,29 @@ _layouts: _axes: - - &axis_pT + - &axis_protons_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - - &axis_rapidity + - &axis_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] + - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 + - &axis_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pi_pos_cuts + mdc_vtx_tracks_extra/pid: { equals: 211 } + - &pi_neg_cuts + mdc_vtx_tracks_extra/pid: { equals: -211 } - &good_particle_cuts mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} @@ -59,19 +71,19 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pT - - *axis_rapidity + - *axis_protons_pT + - *axis_protons_rapidity cuts-pid: *protons_cuts cuts-quality: *good_particle_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pT - - *axis_rapidity - - [*axis_rapidity, *axis_pT] + - *axis_protons_pT + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# - - name: pions + - name: pi_pos type: track phi: mdc_vtx_tracks_extra/phi weight: Ones @@ -79,12 +91,38 @@ hades_analysis: corrections: - recentering - twist-and-rescale + axes: + - *axis_pions_pT + - *axis_pions_rapidity + cuts-pid: + *pi_pos_cuts cuts-quality: *good_particle_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pions_pT + - *axis_pions_rapidity + - [*axis_pions_rapidity, *axis_pions_pT] + - name: pi_neg + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pions_pT + - *axis_pions_rapidity cuts-pid: - mdc_vtx_tracks_extra/is_pion: { equals: 1 } + *pi_neg_cuts + cuts-quality: + *good_particle_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_pions_pT + - *axis_pions_rapidity + - [*axis_pions_rapidity, *axis_pions_pT] ############################################################# - name: Mf type: track diff --git a/setups/hades/correlation-agag-123.yml b/setups/hades/correlation-agag-123.yml index 59b75af5..9a4ef34c 100644 --- a/setups/hades/correlation-agag-123.yml +++ b/setups/hades/correlation-agag-123.yml @@ -1,22 +1,20 @@ _detectors: &detectors - name: protons tags: [ un_vector ] - - name: pions - tags: [ q2_vector ] + - name: pi_pos + tags: [ un_vector ] + - name: pi_neg + tags: [ un_vector ] - name: W1 tags: [ qn_vector ] - name: W2 tags: [ qn_vector ] - name: W3 tags: [ qn_vector ] - - name: R1 - tags: [ rnd_vector ] - - name: R2 - tags: [ rnd_vector ] - name: Mf - tags: [ qn_vector ] + tags: [ qn_vector, mdc ] - name: Mb - tags: [ qn_vector ] + tags: [ qn_vector, mdc ] _axes: - ¢rality @@ -52,12 +50,6 @@ _tasks_args: components: *sp_components correction-steps: [ rescaled ] weight: ones - - &ta_q2_sp - query: { tags: { any-in: [ q2_vector ] } } - query-list: *detectors - components: *sp2_components - correction-steps: [ rescaled ] - weight: ones - &ta_qn_ep query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors @@ -78,59 +70,35 @@ _tasks_args: weight: ones _tasks: +# Scalar product - args: [*ta_u, *ta_qn_sp] n-samples: 100 weights-type: observable - folder: "/SP/uQ" + folder: "/SP/u1Q1" axes: [ *centrality ] - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: observable folder: "/SP/u2Q1Q1" axes: [ *centrality ] - - args: [*ta_u2, *ta_q2_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/u2Q2" - axes: [ *centrality ] - - args: [*ta_u, *ta_qn_ep] - n-samples: 100 - weights-type: observable - folder: "/EP/uQ" - axes: [ *centrality ] - - args: [*ta_u, *ta_rnd_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/uQ" - axes: [ *centrality ] - - args: [*ta_u, *ta_rnd_ep] - n-samples: 100 - weights-type: observable - folder: "/EP/uQ" - axes: [ *centrality ] - # Reference x Reference - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: reference - folder: "/SP/QQ" + folder: "/SP/Q1Q1" axes: [ *centrality ] - - args: [*ta_q2_sp, *ta_qn_sp, *ta_qn_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/Q2Q1Q1" - axes: [ *centrality ] - - args: [*ta_qn_ep, *ta_qn_ep] - n-samples: 100 - weights-type: reference - folder: "/EP/QQ" - axes: [ *centrality ] - - args: [*ta_rnd_sp, *ta_rnd_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/QQ" - axes: [ *centrality ] - - args: [*ta_rnd_ep, *ta_rnd_ep] - n-samples: 100 - weights-type: reference - folder: "/EP/QQ" - axes: [ *centrality ] \ No newline at end of file + # Event plane + # - args: [*ta_u, *ta_qn_ep] + # n-samples: 100 + # weights-type: observable + # folder: "/EP/u1Q1" + # axes: [ *centrality ] + # - args: [*ta_u2, *ta_qn_ep, *ta_qn_ep] + # n-samples: 100 + # weights-type: observable + # folder: "/EP/u2Q1Q1" + # axes: [ *centrality ] + # - args: [*ta_qn_ep, *ta_qn_ep] + # n-samples: 100 + # weights-type: reference + # folder: "/EP/Q1Q1" + # axes: [ *centrality ] \ No newline at end of file diff --git a/setups/hades/correlation-agag-158.yml b/setups/hades/correlation-agag-158.yml index 59b75af5..5938ec63 100644 --- a/setups/hades/correlation-agag-158.yml +++ b/setups/hades/correlation-agag-158.yml @@ -1,22 +1,20 @@ _detectors: &detectors - name: protons tags: [ un_vector ] - - name: pions - tags: [ q2_vector ] + - name: pi_pos + tags: [ un_vector ] + - name: pi_neg + tags: [ un_vector ] - name: W1 tags: [ qn_vector ] - name: W2 tags: [ qn_vector ] - name: W3 tags: [ qn_vector ] - - name: R1 - tags: [ rnd_vector ] - - name: R2 - tags: [ rnd_vector ] - name: Mf - tags: [ qn_vector ] + tags: [ qn_vector, mdc ] - name: Mb - tags: [ qn_vector ] + tags: [ qn_vector, mdc ] _axes: - ¢rality @@ -52,12 +50,6 @@ _tasks_args: components: *sp_components correction-steps: [ rescaled ] weight: ones - - &ta_q2_sp - query: { tags: { any-in: [ q2_vector ] } } - query-list: *detectors - components: *sp2_components - correction-steps: [ rescaled ] - weight: ones - &ta_qn_ep query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors @@ -81,56 +73,15 @@ _tasks: - args: [*ta_u, *ta_qn_sp] n-samples: 100 weights-type: observable - folder: "/SP/uQ" + folder: "/SP/u1Q1" axes: [ *centrality ] - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: observable folder: "/SP/u2Q1Q1" axes: [ *centrality ] - - args: [*ta_u2, *ta_q2_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/u2Q2" - axes: [ *centrality ] - - args: [*ta_u, *ta_qn_ep] - n-samples: 100 - weights-type: observable - folder: "/EP/uQ" - axes: [ *centrality ] - - args: [*ta_u, *ta_rnd_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/uQ" - axes: [ *centrality ] - - args: [*ta_u, *ta_rnd_ep] - n-samples: 100 - weights-type: observable - folder: "/EP/uQ" - axes: [ *centrality ] - # Reference x Reference - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: reference - folder: "/SP/QQ" - axes: [ *centrality ] - - args: [*ta_q2_sp, *ta_qn_sp, *ta_qn_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/Q2Q1Q1" - axes: [ *centrality ] - - args: [*ta_qn_ep, *ta_qn_ep] - n-samples: 100 - weights-type: reference - folder: "/EP/QQ" - axes: [ *centrality ] - - args: [*ta_rnd_sp, *ta_rnd_sp] - n-samples: 100 - weights-type: reference - folder: "/SP/QQ" - axes: [ *centrality ] - - args: [*ta_rnd_ep, *ta_rnd_ep] - n-samples: 100 - weights-type: reference - folder: "/EP/QQ" + folder: "/SP/Q1Q1" axes: [ *centrality ] \ No newline at end of file From 14de98d26b1c3e41f844fd2e119af8ed52089dd7 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 29 Sep 2021 10:33:09 +0200 Subject: [PATCH 196/274] Fix of cbm git stupidity --- cmake_modules/Cuts.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake_modules/Cuts.cmake b/cmake_modules/Cuts.cmake index de8c5aa1..62ec87a1 100644 --- a/cmake_modules/Cuts.cmake +++ b/cmake_modules/Cuts.cmake @@ -7,7 +7,7 @@ set(Cuts_INCLUDE_DIR ${Cuts_INSTALL_DIR}/include) set(Cuts_LIBRARY_DIR ${Cuts_INSTALL_DIR}/lib) ExternalProject_Add(Cuts_Ext - GIT_REPOSITORY "https://git.cbm.gsi.de/pwg-c2f/analysis/cuts.git" + GIT_REPOSITORY "https://github.com/HeavyIonAnalysis/AnalysisTreeCuts" GIT_TAG "master" UPDATE_DISCONNECTED ${UPDATE_DISCONNECTED} SOURCE_DIR "${EXTERNAL_DIR}/Cuts_src" From 7d65d0327f734eac63c626018257e591ecd9d76e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 30 Sep 2021 09:44:39 +0200 Subject: [PATCH 197/274] All correlations returned --- setups/hades/correlation-auau-123.yml | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index ad54299b..ad2c3263 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -81,22 +81,22 @@ _tasks: weights-type: observable folder: "/checks/u2" axes: [ *centrality ] - # Scalar product -# - args: [*ta_u, *ta_qn_sp] -# n-samples: 100 -# weights-type: observable -# folder: "/SP/u1Q1" -# axes: [ *centrality ] -# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] -# n-samples: 100 -# weights-type: observable -# folder: "/SP/u2Q1Q1" -# axes: [ *centrality ] -# - args: [*ta_qn_sp, *ta_qn_sp] -# n-samples: 100 -# weights-type: reference -# folder: "/SP/Q1Q1" -# axes: [ *centrality ] + Scalar product + - args: [*ta_u, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u1Q1" + axes: [ *centrality ] + - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u2Q1Q1" + axes: [ *centrality ] + - args: [*ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/Q1Q1" + axes: [ *centrality ] # Event plane # - args: [*ta_u, *ta_qn_ep] # n-samples: 100 From 5cdb7c4edfb77165e733776e63ce791dff820133 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 30 Sep 2021 10:14:10 +0200 Subject: [PATCH 198/274] Pions in Ag+Ag are weighted with efficiency Fix of Au+AU correlation config --- setups/hades/correction-agag-158.yml | 46 +++++++++++++-------------- setups/hades/correlation-auau-123.yml | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index 95530f63..960f8555 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -86,7 +86,7 @@ hades_analysis: - name: pi_pos type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering @@ -106,7 +106,7 @@ hades_analysis: - name: pi_neg type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering @@ -158,27 +158,27 @@ hades_analysis: qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - - name: R1 - type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal - norm: m - corrections: - - recentering - - twist-and-rescale - cuts: - *r1_cuts - ############################################################# - - name: R2 - type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal - norm: m - corrections: - - recentering - - twist-and-rescale - cuts: - *r2_cuts +# - name: R1 +# type: track +# phi: forward_wall_hits/phi +# weight: forward_wall_hits/signal +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts: +# *r1_cuts +# ############################################################# +# - name: R2 +# type: track +# phi: forward_wall_hits/phi +# weight: forward_wall_hits/signal +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts: +# *r2_cuts ############################################################# - name: W1 type: track diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index ad2c3263..5cd776ce 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -81,7 +81,7 @@ _tasks: weights-type: observable folder: "/checks/u2" axes: [ *centrality ] - Scalar product +# Scalar product - args: [*ta_u, *ta_qn_sp] n-samples: 100 weights-type: observable From b1ef7affe2d6db85bd5162a6fcd2b7f81b9a205e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 30 Sep 2021 10:26:09 +0200 Subject: [PATCH 199/274] Pions in Ag+Ag are weighted with efficiency --- setups/hades/correction-agag-123.yml | 44 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 7f3b1229..739151fa 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -84,7 +84,7 @@ hades_analysis: - name: pi_pos type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering @@ -104,7 +104,7 @@ hades_analysis: - name: pi_neg type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering @@ -153,26 +153,26 @@ hades_analysis: *protons_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - name: R1 - type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal - norm: m - corrections: - - recentering - - twist-and-rescale - cuts: - *r1_cuts - - name: R2 - type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal - norm: m - corrections: - - recentering - - twist-and-rescale - cuts: - *r2_cuts +# - name: R1 +# type: track +# phi: forward_wall_hits/phi +# weight: forward_wall_hits/signal +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts: +# *r1_cuts +# - name: R2 +# type: track +# phi: forward_wall_hits/phi +# weight: forward_wall_hits/signal +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# cuts: +# *r2_cuts - name: W1 type: track phi: forward_wall_hits/phi From 32a969360ea14b3760ba4e94b78eae63354aa3de Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 30 Sep 2021 15:33:21 +0200 Subject: [PATCH 200/274] Only directed flow --- setups/hades/correlation-agag-123.yml | 10 ++++----- setups/hades/correlation-agag-158.yml | 10 ++++----- setups/hades/correlation-auau-123.yml | 30 +++++++++++++-------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/setups/hades/correlation-agag-123.yml b/setups/hades/correlation-agag-123.yml index 9a4ef34c..9778353f 100644 --- a/setups/hades/correlation-agag-123.yml +++ b/setups/hades/correlation-agag-123.yml @@ -76,11 +76,11 @@ _tasks: weights-type: observable folder: "/SP/u1Q1" axes: [ *centrality ] - - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/u2Q1Q1" - axes: [ *centrality ] +# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/u2Q1Q1" +# axes: [ *centrality ] - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: reference diff --git a/setups/hades/correlation-agag-158.yml b/setups/hades/correlation-agag-158.yml index 5938ec63..18f900bf 100644 --- a/setups/hades/correlation-agag-158.yml +++ b/setups/hades/correlation-agag-158.yml @@ -75,11 +75,11 @@ _tasks: weights-type: observable folder: "/SP/u1Q1" axes: [ *centrality ] - - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/u2Q1Q1" - axes: [ *centrality ] +# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/u2Q1Q1" +# axes: [ *centrality ] - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: reference diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 5cd776ce..37f56fad 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -71,27 +71,27 @@ _tasks_args: _tasks: # Checks - - args: [*ta_u] - n-samples: 100 - weights-type: observable - folder: "/checks/u1" - axes: [ *centrality ] - - args: [*ta_u2] - n-samples: 100 - weights-type: observable - folder: "/checks/u2" - axes: [ *centrality ] +# - args: [*ta_u] +# n-samples: 100 +# weights-type: observable +# folder: "/checks/u1" +# axes: [ *centrality ] +# - args: [*ta_u2] +# n-samples: 100 +# weights-type: observable +# folder: "/checks/u2" +# axes: [ *centrality ] # Scalar product - args: [*ta_u, *ta_qn_sp] n-samples: 100 weights-type: observable folder: "/SP/u1Q1" axes: [ *centrality ] - - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] - n-samples: 100 - weights-type: observable - folder: "/SP/u2Q1Q1" - axes: [ *centrality ] +# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] +# n-samples: 100 +# weights-type: observable +# folder: "/SP/u2Q1Q1" +# axes: [ *centrality ] - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: reference From 8a18e2671313841562f243e0eac367cc8a143658 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 30 Sep 2021 17:14:12 +0200 Subject: [PATCH 201/274] Excess vector removed --- setups/hades/correction-agag-158.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index 960f8555..fdccb1c1 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -212,8 +212,8 @@ hades_analysis: - twist-and-rescale cuts: *w3_cuts - - name: wall_plain - type: psi - phi: event_header/fw_angle_plain - weight: Ones - norm: m \ No newline at end of file +# - name: wall_plain +# type: psi +# phi: event_header/fw_angle_plain +# weight: Ones +# norm: m \ No newline at end of file From 24b33f8b9f3d2269747db278c0f6fe3d525c1a7a Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 1 Oct 2021 09:06:01 +0200 Subject: [PATCH 202/274] Correlation of rescaled vectors --- setups/hades/correlation-auau-123.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 37f56fad..19a1770d 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -36,37 +36,37 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: sumw - &ta_u2 query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp2_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: sumw - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: ones - &ta_qn_ep query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *ep_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: ones - &ta_rnd_sp query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: ones - &ta_rnd_ep query: { tags: { any-in: [ rnd_vector ] } } query-list: *detectors components: *ep_components - correction-steps: [ plain ] + correction-steps: [ rescaled ] weight: ones _tasks: From 9c2323570ef8481272538153134cf6a7ad061ada Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 4 Oct 2021 23:01:05 +0200 Subject: [PATCH 203/274] Only first order correlation --- setups/hades/mc-correction-auau-123.yml | 7 +++-- setups/hades/mc-correlation.yml | 40 ++++++++++++------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 0ac51193..84d71424 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -89,7 +89,8 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency +# weight: mdc_vtx_tracks_extra/efficiency + weight: Ones norm: m corrections: - recentering @@ -111,7 +112,7 @@ hades_analysis: - name: pid_pi_pos type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency + weight: Ones norm: m corrections: - recentering @@ -133,7 +134,7 @@ hades_analysis: - name: pid_pi_neg type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency + weight: Ones norm: m corrections: - recentering diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 96b53ff3..813ec83a 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -86,16 +86,16 @@ _tasks: weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] - - args: [*ta_reco2, *ta_psi] - n-samples: 100 - weights-type: observable - folder: "/u2Q1/reco" - axes: [ *centrality ] - - args: [*ta_reco2, *ta_psi2] - n-samples: 100 - weights-type: observable - folder: "/u2Q2/reco" - axes: [ *centrality ] +# - args: [*ta_reco2, *ta_psi] +# n-samples: 100 +# weights-type: observable +# folder: "/u2Q1/reco" +# axes: [ *centrality ] +# - args: [*ta_reco2, *ta_psi2] +# n-samples: 100 +# weights-type: observable +# folder: "/u2Q2/reco" +# axes: [ *centrality ] # - args: [*ta_reco, *ta_qn] # n-samples: 100 # weights-type: observable @@ -106,16 +106,16 @@ _tasks: weights-type: observable folder: "/uQ/gen" axes: [ *centrality ] - - args: [*ta_sim2, *ta_psi] - n-samples: 100 - weights-type: observable - folder: "/u2Q1/gen" - axes: [ *centrality ] - - args: [*ta_sim2, *ta_psi2] - n-samples: 100 - weights-type: observable - folder: "/u2Q2/gen" - axes: [ *centrality ] +# - args: [*ta_sim2, *ta_psi] +# n-samples: 100 +# weights-type: observable +# folder: "/u2Q1/gen" +# axes: [ *centrality ] +# - args: [*ta_sim2, *ta_psi2] +# n-samples: 100 +# weights-type: observable +# folder: "/u2Q2/gen" +# axes: [ *centrality ] # - args: [*ta_qn, *ta_psi] # n-samples: 100 # weights-type: reference From 3678c4061b7437874e0e2f0b3e2dd138254907cc Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 11 Oct 2021 10:52:16 +0200 Subject: [PATCH 204/274] More bins along theta --- setups/hades/mc-correction-auau-123-all.yml | 35 ++------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 8c723c92..70d6ba4e 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -1,40 +1,14 @@ _layouts: _axes: - - &axis_protons_pT - name: mdc_vtx_tracks_extra/pT - bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - - &axis_gen_protons_pT - name: sim_particles_extra/pT - bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] - - &axis_protons_rapidity - name: mdc_vtx_tracks_extra/ycm - nb: 15 - lo: -0.75 - hi: 0.75 - - &axis_protons_eta - name: mdc_vtx_tracks_extra/eta_cm - nb: 15 - lo: -1.8 - hi: 1.2 - &axis_protons_theta name: mdc_vtx_tracks_extra/theta - nb: 12 + nb: 48 lo: 0.3 hi: 1.5 - - &axis_gen_protons_rapidity - name: sim_particles_extra/ycm - nb: 15 - lo: -0.75 - hi: 0.75 - - &axis_gen_protons_eta - name: sim_particles_extra/eta_cm - nb: 15 - lo: -1.8 - hi: 1.2 - &axis_gen_protons_theta name: sim_particles_extra/theta - nb: 12 + nb: 48 lo: 0.3 hi: 1.5 @@ -48,15 +22,12 @@ hades_analysis: - name: accepted type: track phi: mdc_vtx_tracks_extra/phi -# weight: mdc_vtx_tracks_extra/efficiency weight: Ones norm: m corrections: - recentering - twist-and-rescale axes: -# - *axis_protons_pT -# - *axis_protons_rapidity - *axis_protons_theta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} @@ -74,8 +45,6 @@ hades_analysis: cuts: sim_particles_extra/is_charged: {equals: 1} axes: -# - *axis_gen_protons_pT -# - *axis_gen_protons_rapidity - *axis_gen_protons_theta qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} From 172763623dc916ceb96e9135c4147680fdccfb52 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 11 Oct 2021 11:43:42 +0200 Subject: [PATCH 205/274] Bugfix --- setups/hades/mc-correction-auau-123-all.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 70d6ba4e..39d75597 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -31,11 +31,6 @@ hades_analysis: - *axis_protons_theta cuts: mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_protons_pT - - *axis_protons_rapidity - - [*axis_protons_rapidity, *axis_protons_pT] ########################################################################### - name: protons type: track @@ -46,11 +41,6 @@ hades_analysis: sim_particles_extra/is_charged: {equals: 1} axes: - *axis_gen_protons_theta - qa: - - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_gen_protons_pT - - *axis_gen_protons_rapidity - - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] ########################################################################### - name: psi_rp type: psi From 0894ba87040293f5f887f88d7133d2b3796e4902 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 12 Oct 2021 19:23:10 +0200 Subject: [PATCH 206/274] Elliptic flow added --- setups/hades/mc-correlation.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 813ec83a..edff980d 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -91,10 +91,10 @@ _tasks: # weights-type: observable # folder: "/u2Q1/reco" # axes: [ *centrality ] -# - args: [*ta_reco2, *ta_psi2] -# n-samples: 100 -# weights-type: observable -# folder: "/u2Q2/reco" + - args: [*ta_reco2, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u2Q2/reco" # axes: [ *centrality ] # - args: [*ta_reco, *ta_qn] # n-samples: 100 @@ -111,11 +111,11 @@ _tasks: # weights-type: observable # folder: "/u2Q1/gen" # axes: [ *centrality ] -# - args: [*ta_sim2, *ta_psi2] -# n-samples: 100 -# weights-type: observable -# folder: "/u2Q2/gen" -# axes: [ *centrality ] + - args: [*ta_sim2, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u2Q2/gen" + axes: [ *centrality ] # - args: [*ta_qn, *ta_psi] # n-samples: 100 # weights-type: reference From 51608270ba81154880caf50b29e005090dbe8c66 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 13 Oct 2021 10:12:42 +0200 Subject: [PATCH 207/274] Fix --- setups/hades/mc-correlation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index edff980d..6e443540 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -95,7 +95,7 @@ _tasks: n-samples: 100 weights-type: observable folder: "/u2Q2/reco" -# axes: [ *centrality ] + axes: [ *centrality ] # - args: [*ta_reco, *ta_qn] # n-samples: 100 # weights-type: observable From 05b093c7e46a39eed3b8950888371bcd2a95d563 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 15 Oct 2021 11:40:25 +0200 Subject: [PATCH 208/274] v1 all vs pT and theta in protons and pions pT-binnings --- setups/hades/mc-correction-auau-123-all.yml | 47 +++++++++++++++------ setups/hades/mc-correlation-all.yml | 22 +++++----- 2 files changed, 47 insertions(+), 22 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 39d75597..57a73afe 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -3,15 +3,26 @@ _layouts: _axes: - &axis_protons_theta name: mdc_vtx_tracks_extra/theta - nb: 48 + nb: 12 lo: 0.3 hi: 1.5 - &axis_gen_protons_theta name: sim_particles_extra/theta - nb: 48 + nb: 12 lo: 0.3 hi: 1.5 - + - &axis_protons_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] + - &axis_gen_protons_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_gen_pions_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] hades_analysis: event-variables: - event_header/selected_tof_rpc_hits_centrality @@ -19,20 +30,31 @@ hades_analysis: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: ########################################################################### - - name: accepted +# - name: accepted +# type: track +# phi: mdc_vtx_tracks_extra/phi +# weight: Ones +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# axes: +# - *axis_protons_theta +# cuts: +# mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + ########################################################################### + - name: protons type: track - phi: mdc_vtx_tracks_extra/phi + phi: sim_particles_extra/phi weight: Ones norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_protons_theta cuts: - mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + sim_particles_extra/is_charged: {equals: 1} + axes: + - *axis_gen_protons_theta + - *axis_gen_protons_pT ########################################################################### - - name: protons + - name: pions type: track phi: sim_particles_extra/phi weight: Ones @@ -41,6 +63,7 @@ hades_analysis: sim_particles_extra/is_charged: {equals: 1} axes: - *axis_gen_protons_theta + - *axis_gen_pions_pT ########################################################################### - name: psi_rp type: psi diff --git a/setups/hades/mc-correlation-all.yml b/setups/hades/mc-correlation-all.yml index a60b2a01..bcb70056 100644 --- a/setups/hades/mc-correlation-all.yml +++ b/setups/hades/mc-correlation-all.yml @@ -3,6 +3,8 @@ _detectors: &detectors tags: [ rec_un_vector ] - name: protons tags: [ gen_un_vector ] + - name: pions + tags: [ gen_un_vector ] - name: psi_rp tags: [ psi_vector ] @@ -58,16 +60,16 @@ _tasks_args: weight: ones _tasks: - - args: [*ta_accepted, *ta_psi] - n-samples: 100 - weights-type: observable - folder: "/uQ/reco" - axes: [ *centrality ] - - args: [*ta_accepted2, *ta_psi2] - n-samples: 100 - weights-type: observable - folder: "/u2Q2/reco" - axes: [ *centrality ] +# - args: [*ta_accepted, *ta_psi] +# n-samples: 100 +# weights-type: observable +# folder: "/uQ/reco" +# axes: [ *centrality ] +# - args: [*ta_accepted2, *ta_psi2] +# n-samples: 100 +# weights-type: observable +# folder: "/u2Q2/reco" +# axes: [ *centrality ] - args: [*ta_all, *ta_psi] n-samples: 100 weights-type: observable From c7c32bb7da6d79dd11c6255f280b1a49fb79dc54 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 29 Oct 2021 10:30:23 +0200 Subject: [PATCH 209/274] v1 all vs theta without normalization of un vector --- setups/hades/mc-correction-auau-123-all.yml | 28 ++++++++++----------- setups/hades/mc-correlation-all.yml | 4 +-- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 57a73afe..4d1c04d2 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -3,12 +3,12 @@ _layouts: _axes: - &axis_protons_theta name: mdc_vtx_tracks_extra/theta - nb: 12 + nb: 48 lo: 0.3 hi: 1.5 - &axis_gen_protons_theta name: sim_particles_extra/theta - nb: 12 + nb: 48 lo: 0.3 hi: 1.5 - &axis_protons_pT @@ -34,7 +34,7 @@ hades_analysis: # type: track # phi: mdc_vtx_tracks_extra/phi # weight: Ones -# norm: m +# norm: none # corrections: # - recentering # - twist-and-rescale @@ -47,23 +47,21 @@ hades_analysis: type: track phi: sim_particles_extra/phi weight: Ones - norm: m +# norm: none cuts: sim_particles_extra/is_charged: {equals: 1} axes: - *axis_gen_protons_theta - - *axis_gen_protons_pT ########################################################################### - - name: pions - type: track - phi: sim_particles_extra/phi - weight: Ones - norm: m - cuts: - sim_particles_extra/is_charged: {equals: 1} - axes: - - *axis_gen_protons_theta - - *axis_gen_pions_pT +# - name: pions +# type: track +# phi: sim_particles_extra/phi +# weight: Ones +# norm: m +# cuts: +# sim_particles_extra/is_charged: {equals: 1} +# axes: +# - *axis_gen_protons_theta ########################################################################### - name: psi_rp type: psi diff --git a/setups/hades/mc-correlation-all.yml b/setups/hades/mc-correlation-all.yml index bcb70056..ac2ed0a8 100644 --- a/setups/hades/mc-correlation-all.yml +++ b/setups/hades/mc-correlation-all.yml @@ -3,8 +3,8 @@ _detectors: &detectors tags: [ rec_un_vector ] - name: protons tags: [ gen_un_vector ] - - name: pions - tags: [ gen_un_vector ] +# - name: pions +# tags: [ gen_un_vector ] - name: psi_rp tags: [ psi_vector ] From 8c1148ae78390e3435836965076f05633f213a82 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 15 Nov 2021 10:14:39 +0100 Subject: [PATCH 210/274] Total q-vector of all charged particles in acceptance added --- setups/hades/mc-correction-auau-123-all.yml | 19 +++++++++---------- setups/hades/mc-correlation-all.yml | 6 ++---- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-all.yml b/setups/hades/mc-correction-auau-123-all.yml index 4d1c04d2..41306508 100644 --- a/setups/hades/mc-correction-auau-123-all.yml +++ b/setups/hades/mc-correction-auau-123-all.yml @@ -47,21 +47,20 @@ hades_analysis: type: track phi: sim_particles_extra/phi weight: Ones -# norm: none + norm: m cuts: sim_particles_extra/is_charged: {equals: 1} axes: - *axis_gen_protons_theta ########################################################################### -# - name: pions -# type: track -# phi: sim_particles_extra/phi -# weight: Ones -# norm: m -# cuts: -# sim_particles_extra/is_charged: {equals: 1} -# axes: -# - *axis_gen_protons_theta + - name: total + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + cuts: + sim_particles_extra/is_charged: {equals: 1} + sim_particles_extra/theta: {range: [0.3, 1.5]} ########################################################################### - name: psi_rp type: psi diff --git a/setups/hades/mc-correlation-all.yml b/setups/hades/mc-correlation-all.yml index ac2ed0a8..7a676d8d 100644 --- a/setups/hades/mc-correlation-all.yml +++ b/setups/hades/mc-correlation-all.yml @@ -1,10 +1,8 @@ _detectors: &detectors - - name: accepted - tags: [ rec_un_vector ] - name: protons tags: [ gen_un_vector ] -# - name: pions -# tags: [ gen_un_vector ] + - name: total + tags: [ gen_un_vector ] - name: psi_rp tags: [ psi_vector ] From 3cc0a8d5a942e26326b284c9e608ce7c84b8c08d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 15 Nov 2021 10:54:59 +0100 Subject: [PATCH 211/274] Only protons directed and elliptic flow --- setups/hades/correction-auau-123.yml | 76 ++++++++++---------- setups/hades/correlation-auau-123-proton.yml | 24 +++---- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index a11741a2..49c7dd8a 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -3,7 +3,7 @@ _layouts: _axes: - &axis_protons_pT name: mdc_vtx_tracks_extra/pT - bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - &axis_pions_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] @@ -89,43 +89,43 @@ hades_analysis: - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# - - name: pi_pos - type: track - phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_pions_pT - - *axis_pions_rapidity -# - *axis_theta - cuts-quality: - *good_particle_cuts - cuts-pid: - *pi_pos_cuts - qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - ############################################################# - - name: pi_neg - type: track - phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_pions_pT - - *axis_pions_rapidity -# - *axis_theta - cuts-quality: - *good_particle_cuts - cuts-pid: - *pi_neg_cuts - qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} +# - name: pi_pos +# type: track +# phi: mdc_vtx_tracks_extra/phi +# weight: mdc_vtx_tracks_extra/efficiency +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# axes: +# - *axis_pions_pT +# - *axis_pions_rapidity +## - *axis_theta +# cuts-quality: +# *good_particle_cuts +# cuts-pid: +# *pi_pos_cuts +# qa: +# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} +# ############################################################# +# - name: pi_neg +# type: track +# phi: mdc_vtx_tracks_extra/phi +# weight: mdc_vtx_tracks_extra/efficiency +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# axes: +# - *axis_pions_pT +# - *axis_pions_rapidity +## - *axis_theta +# cuts-quality: +# *good_particle_cuts +# cuts-pid: +# *pi_neg_cuts +# qa: +# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: Mf type: track diff --git a/setups/hades/correlation-auau-123-proton.yml b/setups/hades/correlation-auau-123-proton.yml index 29880082..e8be46c3 100644 --- a/setups/hades/correlation-auau-123-proton.yml +++ b/setups/hades/correlation-auau-123-proton.yml @@ -71,24 +71,24 @@ _tasks: weights-type: observable folder: "/SP/uQ" axes: [ *centrality ] -# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] -# n-samples: 100 -# weights-type: observable -# folder: "/SP/u2Q1Q1" -# axes: [ *centrality ] - - args: [*ta_u, *ta_qn_ep] + - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: observable - folder: "/EP/uQ" + folder: "/SP/u2Q1Q1" axes: [ *centrality ] +# - args: [*ta_u, *ta_qn_ep] +# n-samples: 100 +# weights-type: observable +# folder: "/EP/uQ" +# axes: [ *centrality ] # Reference x Reference - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: reference folder: "/SP/QQ" axes: [ *centrality ] - - args: [*ta_qn_ep, *ta_qn_ep] - n-samples: 100 - weights-type: reference - folder: "/EP/QQ" - axes: [ *centrality ] \ No newline at end of file +# - args: [*ta_qn_ep, *ta_qn_ep] +# n-samples: 100 +# weights-type: reference +# folder: "/EP/QQ" +# axes: [ *centrality ] \ No newline at end of file From f54d75250be3fd4661a1ea2f5da90d11dd393ebb Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 15 Nov 2021 10:58:02 +0100 Subject: [PATCH 212/274] Only protons directed and elliptic flow --- setups/hades/correction-agag-158.yml | 87 ++++++++++++++-------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/setups/hades/correction-agag-158.yml b/setups/hades/correction-agag-158.yml index fdccb1c1..12e600df 100644 --- a/setups/hades/correction-agag-158.yml +++ b/setups/hades/correction-agag-158.yml @@ -3,7 +3,7 @@ _layouts: _axes: - &axis_protons_pT name: mdc_vtx_tracks_extra/pT - bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - &axis_pions_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] @@ -61,7 +61,7 @@ hades_analysis: axes: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: - ############################################################# + ############################################################# - name: protons type: track phi: mdc_vtx_tracks_extra/phi @@ -82,47 +82,48 @@ hades_analysis: - *axis_protons_pT - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] - ############################################################# - - name: pi_pos - type: track - phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_pions_pT - - *axis_pions_rapidity - cuts-pid: - *pi_pos_cuts - cuts-quality: - *good_particle_cuts - qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pions_pT - - *axis_pions_rapidity - - [*axis_pions_rapidity, *axis_pions_pT] - - name: pi_neg - type: track - phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_pions_pT - - *axis_pions_rapidity - cuts-pid: - *pi_neg_cuts - cuts-quality: - *good_particle_cuts - qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pions_pT - - *axis_pions_rapidity - - [*axis_pions_rapidity, *axis_pions_pT] + ############################################################# +# - name: pi_pos +# type: track +# phi: mdc_vtx_tracks_extra/phi +# weight: mdc_vtx_tracks_extra/efficiency +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# axes: +# - *axis_pions_pT +# - *axis_pions_rapidity +# cuts-pid: +# *pi_pos_cuts +# cuts-quality: +# *good_particle_cuts +# qa: +# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} +# - *axis_pions_pT +# - *axis_pions_rapidity +# - [*axis_pions_rapidity, *axis_pions_pT] +# ############################################################# +# - name: pi_neg +# type: track +# phi: mdc_vtx_tracks_extra/phi +# weight: mdc_vtx_tracks_extra/efficiency +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# axes: +# - *axis_pions_pT +# - *axis_pions_rapidity +# cuts-pid: +# *pi_neg_cuts +# cuts-quality: +# *good_particle_cuts +# qa: +# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} +# - *axis_pions_pT +# - *axis_pions_rapidity +# - [*axis_pions_rapidity, *axis_pions_pT] ############################################################# - name: Mf type: track From 7f6a2764d0acbb4538b0ab28be98686f950498ef Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 15 Nov 2021 23:08:03 +0100 Subject: [PATCH 213/274] Efficiency weighting --- setups/hades/mc-correction-auau-123.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 84d71424..fd70c766 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -89,8 +89,8 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_extra/phi -# weight: mdc_vtx_tracks_extra/efficiency - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency +# weight: Ones norm: m corrections: - recentering From 94a6401284b145c85de58e9f901c411c5b1040b2 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 16 Nov 2021 10:16:14 +0100 Subject: [PATCH 214/274] plain reco u-vectors to increase speed of the calculation --- setups/hades/mc-correlation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 6e443540..a6854c01 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -42,13 +42,13 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - &ta_reco2 query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp2_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - &ta_sim query: { tags: { any-in: [ gen_un_vector ] } } From 316e36c42a6c7e7a41fc73846280d3cfa944560f Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 18 Nov 2021 13:28:18 +0100 Subject: [PATCH 215/274] 3 bins on theta axis --- setups/hades/mc-correction-auau-123.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index fd70c766..a71aea0d 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -35,12 +35,12 @@ _axes: hi: 1.05 - &axis_theta name: mdc_vtx_tracks_extra/theta - nb: 12 + nb: 3 lo: 0.3 hi: 1.5 - &axis_gen_theta name: sim_particles_extra/theta - nb: 12 + nb: 3 lo: 0.3 hi: 1.5 _cuts: @@ -89,8 +89,8 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency -# weight: Ones +# weight: mdc_vtx_tracks_extra/efficiency + weight: Ones norm: m corrections: - recentering @@ -98,7 +98,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity -# - *axis_theta + - *axis_theta cuts-pid: *pid_protons_cut cuts-quality: @@ -120,7 +120,7 @@ hades_analysis: axes: - *axis_pions_pT - *axis_pions_rapidity -# - *axis_theta + - *axis_theta cuts-pid: *pid_pi_pos_cut cuts-quality: @@ -142,7 +142,7 @@ hades_analysis: axes: - *axis_pions_pT - *axis_pions_rapidity -# - *axis_theta + - *axis_theta cuts-pid: *pid_pi_neg_cut cuts-quality: @@ -195,7 +195,7 @@ hades_analysis: axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity -# - *axis_gen_theta + - *axis_gen_theta cuts-pid: *gen_prim_protons_cut qa: @@ -212,7 +212,7 @@ hades_analysis: axes: - *axis_gen_pions_pT - *axis_gen_pions_rapidity -# - *axis_gen_theta + - *axis_gen_theta cuts-pid: *gen_prim_pi_pos_cut qa: @@ -229,7 +229,7 @@ hades_analysis: axes: - *axis_gen_pions_pT - *axis_gen_pions_rapidity -# - *axis_gen_theta + - *axis_gen_theta cuts-pid: *gen_prim_pi_neg_cut qa: From ca766594084765e870b82ee0a61933b7c12f0ea3 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 25 Nov 2021 17:21:28 +0100 Subject: [PATCH 216/274] Uniform binning along pT axis --- setups/hades/correction-auau-123.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 49c7dd8a..8251d718 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -1,9 +1,14 @@ _layouts: _axes: +# - &axis_protons_pT +# name: mdc_vtx_tracks_extra/pT +# bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - &axis_protons_pT name: mdc_vtx_tracks_extra/pT - bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] + nb: 20 + lo: 0.0 + hi: 2.0 - &axis_pions_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] From 9705596eb13809f1df0fdd914e7de335191c1867 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 26 Nov 2021 18:04:38 +0100 Subject: [PATCH 217/274] Centrality from extra branch --- setups/hades/correction-agag-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 739151fa..fcf9382f 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -59,7 +59,7 @@ hades_analysis: event-variables: - event_header/selected_tof_rpc_hits_centrality axes: - - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + - { name: event_header_extra/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: - name: protons type: track From e724b4614a0c321599c28adee0f34157bb073878 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 26 Nov 2021 18:27:14 +0100 Subject: [PATCH 218/274] Bugfix --- setups/hades/correction-agag-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index fcf9382f..3e7ce3f7 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -57,7 +57,7 @@ _cuts: hades_analysis: event-variables: - - event_header/selected_tof_rpc_hits_centrality + - event_header_extra/selected_tof_rpc_hits_centrality axes: - { name: event_header_extra/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } q-vectors: From aad7380c84a034316f3d3f26769fe381102f5889 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 26 Nov 2021 18:34:17 +0100 Subject: [PATCH 219/274] Pions are removed, event axis in correlation setup updated --- setups/hades/correction-agag-123.yml | 42 +++++++++++++-------------- setups/hades/correlation-agag-123.yml | 10 +++---- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 3e7ce3f7..3103c0bc 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -59,7 +59,7 @@ hades_analysis: event-variables: - event_header_extra/selected_tof_rpc_hits_centrality axes: - - { name: event_header_extra/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + - { name: event_header_extra/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } q-vectors: - name: protons type: track @@ -101,26 +101,26 @@ hades_analysis: - *axis_pions_pT - *axis_pions_rapidity - [*axis_pions_rapidity, *axis_pions_pT] - - name: pi_neg - type: track - phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_pions_pT - - *axis_pions_rapidity - cuts-pid: - *pi_neg_cuts - cuts-quality: - *good_particle_cuts - qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_pions_pT - - *axis_pions_rapidity - - [*axis_pions_rapidity, *axis_pions_pT] +# - name: pi_neg +# type: track +# phi: mdc_vtx_tracks_extra/phi +# weight: mdc_vtx_tracks_extra/efficiency +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# axes: +# - *axis_pions_pT +# - *axis_pions_rapidity +# cuts-pid: +# *pi_neg_cuts +# cuts-quality: +# *good_particle_cuts +# qa: +# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} +# - *axis_pions_pT +# - *axis_pions_rapidity +# - [*axis_pions_rapidity, *axis_pions_pT] - name: Mf type: track phi: mdc_vtx_tracks_extra/phi diff --git a/setups/hades/correlation-agag-123.yml b/setups/hades/correlation-agag-123.yml index 9778353f..49c22775 100644 --- a/setups/hades/correlation-agag-123.yml +++ b/setups/hades/correlation-agag-123.yml @@ -1,10 +1,10 @@ _detectors: &detectors - name: protons tags: [ un_vector ] - - name: pi_pos - tags: [ un_vector ] - - name: pi_neg - tags: [ un_vector ] +# - name: pi_pos +# tags: [ un_vector ] +# - name: pi_neg +# tags: [ un_vector ] - name: W1 tags: [ qn_vector ] - name: W2 @@ -18,7 +18,7 @@ _detectors: &detectors _axes: - ¢rality - name: event_header_selected_tof_rpc_hits_centrality + name: event_header_extra_selected_tof_rpc_hits_centrality nb: 8 lo: 0 hi: 40 From 0e131520342f0beb0a63681c1c4e236fbb72adb0 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 28 Nov 2021 11:50:27 +0100 Subject: [PATCH 220/274] pt-binning slightly was changed --- setups/hades/correction-agag-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-agag-123.yml b/setups/hades/correction-agag-123.yml index 3103c0bc..847720b8 100644 --- a/setups/hades/correction-agag-123.yml +++ b/setups/hades/correction-agag-123.yml @@ -3,7 +3,7 @@ _layouts: _axes: - &axis_protons_pT name: mdc_vtx_tracks_extra/pT - bin-edges: [0.0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - &axis_pions_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] From 3672ade9122c47aa2743c184614f3835de48a303 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 29 Nov 2021 10:17:48 +0100 Subject: [PATCH 221/274] - Uniform binning along pT-axis - 2D correlations: v1 vs pT and theta --- setups/hades/mc-correction-auau-123.yml | 48 +++++++++++++++++-------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index a71aea0d..9637f22b 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -4,15 +4,35 @@ _axes: - &axis_protons_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_uniform_protons_pT + name: mdc_vtx_tracks_extra/pT + nb: 15 + lo: 0.0 + hi: 1.5 - &axis_pions_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] + - &axis_uniform_pions_pT + name: mdc_vtx_tracks_extra/pT + nb: 10 + lo: 0.0 + hi: 1.0 - &axis_gen_protons_pT name: sim_particles_extra/pT bin-edges: [0, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 2.0] + - &axis_uniform_gen_protons_pT + name: sim_particles_extra/pT + nb: 15 + lo: 0.0 + hi: 1.5 - &axis_gen_pions_pT name: sim_particles_extra/pT bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] + - &axis_unifroms_gen_pions_pT + name: sim_particles_extra/pT + nb: 10 + lo: 0.0 + hi: 1.0 - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm nb: 15 @@ -35,12 +55,12 @@ _axes: hi: 1.05 - &axis_theta name: mdc_vtx_tracks_extra/theta - nb: 3 + nb: 12 lo: 0.3 hi: 1.5 - &axis_gen_theta name: sim_particles_extra/theta - nb: 3 + nb: 12 lo: 0.3 hi: 1.5 _cuts: @@ -96,8 +116,8 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_protons_pT - - *axis_protons_rapidity + - *axis_uniform_protons_pT +# - *axis_protons_rapidity - *axis_theta cuts-pid: *pid_protons_cut @@ -118,8 +138,8 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pions_pT - - *axis_pions_rapidity + - *axis_uniform_pions_pT +# - *axis_pions_rapidity - *axis_theta cuts-pid: *pid_pi_pos_cut @@ -140,8 +160,8 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_pions_pT - - *axis_pions_rapidity + - *axis_uniform_pions_pT +# - *axis_pions_rapidity - *axis_theta cuts-pid: *pid_pi_neg_cut @@ -193,8 +213,8 @@ hades_analysis: weight: Ones norm: m axes: - - *axis_gen_protons_pT - - *axis_gen_protons_rapidity + - *axis_uniform_gen_protons_pT +# - *axis_gen_protons_rapidity - *axis_gen_theta cuts-pid: *gen_prim_protons_cut @@ -210,8 +230,8 @@ hades_analysis: weight: Ones norm: m axes: - - *axis_gen_pions_pT - - *axis_gen_pions_rapidity + - *axis_uniform_gen_pions_pT +# - *axis_gen_pions_rapidity - *axis_gen_theta cuts-pid: *gen_prim_pi_pos_cut @@ -227,8 +247,8 @@ hades_analysis: weight: Ones norm: m axes: - - *axis_gen_pions_pT - - *axis_gen_pions_rapidity + - *axis_uniform_gen_pions_pT +# - *axis_gen_pions_rapidity - *axis_gen_theta cuts-pid: *gen_prim_pi_neg_cut From f9ed3e287928d561aea3bcfd3e7049fa7eaecba5 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 29 Nov 2021 12:28:43 +0100 Subject: [PATCH 222/274] Bugfix --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 9637f22b..4b4f889e 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -28,7 +28,7 @@ _axes: - &axis_gen_pions_pT name: sim_particles_extra/pT bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] - - &axis_unifroms_gen_pions_pT + - &axis_uniform_gen_pions_pT name: sim_particles_extra/pT nb: 10 lo: 0.0 From e035554df297bfb72b94dd3f635d141bab6bfdf2 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 2 Dec 2021 15:51:52 +0100 Subject: [PATCH 223/274] New Correlation added --- setups/hades/mc-correlation.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index a6854c01..3d42f017 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -86,6 +86,11 @@ _tasks: weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] + - args: [*ta_reco, *ta_reco, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u1u1Q2/reco" + axes: [ *centrality ] # - args: [*ta_reco2, *ta_psi] # n-samples: 100 # weights-type: observable @@ -106,6 +111,11 @@ _tasks: weights-type: observable folder: "/uQ/gen" axes: [ *centrality ] + - args: [*ta_sim, *ta_sim, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u1u1Q2/gen" + axes: [ *centrality ] # - args: [*ta_sim2, *ta_psi] # n-samples: 100 # weights-type: observable From f3aaa37651f58bf5167c5973477a251317e5ae56 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 10 Dec 2021 10:13:25 +0100 Subject: [PATCH 224/274] Weighting to count up on occupancy --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 4b4f889e..51c0096f 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -109,7 +109,7 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_extra/phi -# weight: mdc_vtx_tracks_extra/efficiency + weight: mdc_vtx_tracks_extra/occ_weight weight: Ones norm: m corrections: From 576dc6e460c99b69b1c5772148ddd792cf590300 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 10 Dec 2021 10:46:56 +0100 Subject: [PATCH 225/274] Extra correlation removed --- setups/hades/mc-correlation.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index 3d42f017..a6854c01 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -86,11 +86,6 @@ _tasks: weights-type: observable folder: "/uQ/reco" axes: [ *centrality ] - - args: [*ta_reco, *ta_reco, *ta_psi2] - n-samples: 100 - weights-type: observable - folder: "/u1u1Q2/reco" - axes: [ *centrality ] # - args: [*ta_reco2, *ta_psi] # n-samples: 100 # weights-type: observable @@ -111,11 +106,6 @@ _tasks: weights-type: observable folder: "/uQ/gen" axes: [ *centrality ] - - args: [*ta_sim, *ta_sim, *ta_psi2] - n-samples: 100 - weights-type: observable - folder: "/u1u1Q2/gen" - axes: [ *centrality ] # - args: [*ta_sim2, *ta_psi] # n-samples: 100 # weights-type: observable From f0b1d2d9fbbd7d2a508eb09664bc8c60f504b14b Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 10 Dec 2021 11:08:06 +0100 Subject: [PATCH 226/274] - Non-uniform binning - Only protons --- setups/hades/mc-correction-auau-123.yml | 152 ++++++++++++------------ setups/hades/mc-correlation.yml | 16 +-- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 51c0096f..0941d7ae 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -116,8 +116,8 @@ hades_analysis: - recentering - twist-and-rescale axes: - - *axis_uniform_protons_pT -# - *axis_protons_rapidity + - *axis_protons_pT + - *axis_protons_rapidity - *axis_theta cuts-pid: *pid_protons_cut @@ -129,49 +129,49 @@ hades_analysis: - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] ########################################################################## - - name: pid_pi_pos - type: track - phi: mdc_vtx_tracks_extra/phi - weight: Ones - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_uniform_pions_pT +# - name: pid_pi_pos +# type: track +# phi: mdc_vtx_tracks_extra/phi +# weight: Ones +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# axes: +# - *axis_pions_pT # - *axis_pions_rapidity - - *axis_theta - cuts-pid: - *pid_pi_pos_cut - cuts-quality: - *good_track_cuts - qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_protons_pT - - *axis_protons_rapidity - - [*axis_protons_rapidity, *axis_protons_pT] - ########################################################################### - - name: pid_pi_neg - type: track - phi: mdc_vtx_tracks_extra/phi - weight: Ones - norm: m - corrections: - - recentering - - twist-and-rescale - axes: - - *axis_uniform_pions_pT +# - *axis_theta +# cuts-pid: +# *pid_pi_pos_cut +# cuts-quality: +# *good_track_cuts +# qa: +# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} +# - *axis_protons_pT +# - *axis_protons_rapidity +# - [*axis_protons_rapidity, *axis_protons_pT] +# ########################################################################### +# - name: pid_pi_neg +# type: track +# phi: mdc_vtx_tracks_extra/phi +# weight: Ones +# norm: m +# corrections: +# - recentering +# - twist-and-rescale +# axes: +# - *axis_pions_pT # - *axis_pions_rapidity - - *axis_theta - cuts-pid: - *pid_pi_neg_cut - cuts-quality: - *good_track_cuts - qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_protons_pT - - *axis_protons_rapidity - - [*axis_protons_rapidity, *axis_protons_pT] +# - *axis_theta +# cuts-pid: +# *pid_pi_neg_cut +# cuts-quality: +# *good_track_cuts +# qa: +# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} +# - *axis_protons_pT +# - *axis_protons_rapidity +# - [*axis_protons_rapidity, *axis_protons_pT] # ########################################################################### # - name: Mf # type: track @@ -213,50 +213,50 @@ hades_analysis: weight: Ones norm: m axes: - - *axis_uniform_gen_protons_pT -# - *axis_gen_protons_rapidity - - *axis_gen_theta - cuts-pid: - *gen_prim_protons_cut - qa: - - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT - *axis_gen_protons_rapidity - - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] - ############################################################# - - name: gen_prim_pi_pos - type: track - phi: sim_particles_extra/phi - weight: Ones - norm: m - axes: - - *axis_uniform_gen_pions_pT -# - *axis_gen_pions_rapidity - *axis_gen_theta cuts-pid: - *gen_prim_pi_pos_cut + *gen_prim_protons_cut qa: - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_gen_protons_pT - *axis_gen_protons_rapidity - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] ############################################################# - - name: gen_prim_pi_neg - type: track - phi: sim_particles_extra/phi - weight: Ones - norm: m - axes: - - *axis_uniform_gen_pions_pT +# - name: gen_prim_pi_pos +# type: track +# phi: sim_particles_extra/phi +# weight: Ones +# norm: m +# axes: +# - *axis_gen_pions_pT # - *axis_gen_pions_rapidity - - *axis_gen_theta - cuts-pid: - *gen_prim_pi_neg_cut - qa: - - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_gen_protons_pT - - *axis_gen_protons_rapidity - - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] +# - *axis_gen_theta +# cuts-pid: +# *gen_prim_pi_pos_cut +# qa: +# - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} +# - *axis_gen_protons_pT +# - *axis_gen_protons_rapidity +# - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] +# ############################################################# +# - name: gen_prim_pi_neg +# type: track +# phi: sim_particles_extra/phi +# weight: Ones +# norm: m +# axes: +# - *axis_gen_pions_pT +# - *axis_gen_pions_rapidity +# - *axis_gen_theta +# cuts-pid: +# *gen_prim_pi_neg_cut +# qa: +# - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} +# - *axis_gen_protons_pT +# - *axis_gen_protons_rapidity +# - [*axis_gen_protons_rapidity, *axis_gen_protons_pT] ########################################################################### # - name: W1 # type: track diff --git a/setups/hades/mc-correlation.yml b/setups/hades/mc-correlation.yml index a6854c01..c3a1cff7 100644 --- a/setups/hades/mc-correlation.yml +++ b/setups/hades/mc-correlation.yml @@ -1,16 +1,16 @@ _detectors: &detectors - name: pid_protons tags: [ un_vector ] - - name: pid_pi_pos - tags: [ un_vector ] - - name: pid_pi_neg - tags: [ un_vector ] +# - name: pid_pi_pos +# tags: [ un_vector ] +# - name: pid_pi_neg +# tags: [ un_vector ] - name: gen_prim_protons tags: [ gen_un_vector ] - - name: gen_prim_pi_pos - tags: [ gen_un_vector ] - - name: gen_prim_pi_neg - tags: [ gen_un_vector ] +# - name: gen_prim_pi_pos +# tags: [ gen_un_vector ] +# - name: gen_prim_pi_neg +# tags: [ gen_un_vector ] - name: psi_rp tags: [ psi_vector ] - name: W1 From 4ba71b1074ebc03d3000247f66f41f76889ab7d8 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 10 Dec 2021 17:43:13 +0100 Subject: [PATCH 227/274] Excess axis removed --- setups/hades/mc-correction-auau-123.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index 0941d7ae..afd266a9 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -118,7 +118,7 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity - - *axis_theta +# - *axis_theta cuts-pid: *pid_protons_cut cuts-quality: @@ -215,7 +215,7 @@ hades_analysis: axes: - *axis_gen_protons_pT - *axis_gen_protons_rapidity - - *axis_gen_theta +# - *axis_gen_theta cuts-pid: *gen_prim_protons_cut qa: From 6c2d5ee23993894ef592ae866d08f0dfa496c6ee Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 10 Dec 2021 17:51:03 +0100 Subject: [PATCH 228/274] Fix --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index afd266a9..bc2be9d5 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -110,7 +110,7 @@ hades_analysis: type: track phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/occ_weight - weight: Ones +# weight: Ones norm: m corrections: - recentering From b86f0761ccddf41400a2338d1c7741d7d0c9e079 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 15 Dec 2021 14:53:26 +0100 Subject: [PATCH 229/274] Sector weighting --- setups/hades/mc-correction-auau-123.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123.yml b/setups/hades/mc-correction-auau-123.yml index bc2be9d5..d22794ce 100644 --- a/setups/hades/mc-correction-auau-123.yml +++ b/setups/hades/mc-correction-auau-123.yml @@ -109,7 +109,7 @@ hades_analysis: - name: pid_protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/occ_weight + weight: mdc_vtx_tracks_extra/sector_weight # weight: Ones norm: m corrections: From 294dc297803a12ab995b0bb1f0c27b7176900eaa Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 15 Dec 2021 15:19:27 +0100 Subject: [PATCH 230/274] Updated configurations --- .../mc-correction-auau-123-occupancy.yml | 150 ++++++++++++++++++ .../mc-correlation-auau-123-occupancy.yml | 81 ++++++++++ 2 files changed, 231 insertions(+) create mode 100644 setups/hades/mc-correction-auau-123-occupancy.yml create mode 100644 setups/hades/mc-correlation-auau-123-occupancy.yml diff --git a/setups/hades/mc-correction-auau-123-occupancy.yml b/setups/hades/mc-correction-auau-123-occupancy.yml new file mode 100644 index 00000000..4fc53628 --- /dev/null +++ b/setups/hades/mc-correction-auau-123-occupancy.yml @@ -0,0 +1,150 @@ +_layouts: + +_axes: + - &axis_rec_protons_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_tru_protons_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_rec_protons_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_tru_protons_rapidity + name: sim_particles_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_gen_pions_rapidity + name: sim_particles_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_theta + name: mdc_vtx_tracks_extra/theta + nb: 12 + lo: 0.3 + hi: 1.5 + - &axis_gen_theta + name: sim_particles_extra/theta + nb: 12 + lo: 0.3 + hi: 1.5 +_cuts: + - &pid_protons_cut + mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pid_pi_pos_cut + mdc_vtx_tracks_extra/pid: { equals: 211 } + - &pid_pi_neg_cut + mdc_vtx_tracks_extra/pid: { equals: -211 } + - &mf_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} + - &mb_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} + - &gen_prim_protons_cut + sim_particles_extra/pid: { equals: 2212 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_pos_cut + sim_particles_extra/pid: { equals: 211 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_neg_cut + sim_particles_extra/pid: { equals: -211 } + sim_particles_extra/is_primary: { equals: 1 } + - &good_track_cuts + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } + q-vectors: + ########################################################################### + - name: rec_protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + axes: + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + cuts-pid: *pid_protons_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] + ########################################################################### + - name: occ_protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/occ_weight + norm: m + axes: + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + cuts-pid: *pid_protons_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] + ########################################################################### + - name: sec_protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/sector_weight + norm: m + axes: + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + cuts-pid: *pid_protons_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] + ############################################################# + - name: tru_protons + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_protons_pT + - *axis_tru_protons_rapidity + cuts-pid: *gen_prim_protons_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_protons_pT + - *axis_tru_protons_rapidity + - [*axis_tru_protons_rapidity, *axis_tru_protons_pT] + ########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag \ No newline at end of file diff --git a/setups/hades/mc-correlation-auau-123-occupancy.yml b/setups/hades/mc-correlation-auau-123-occupancy.yml new file mode 100644 index 00000000..41da10c9 --- /dev/null +++ b/setups/hades/mc-correlation-auau-123-occupancy.yml @@ -0,0 +1,81 @@ +_detectors: &detectors + - name: rec_protons + tags: [ rec_vector ] + - name: occ_protons + tags: [ rec_vector ] + - name: sec_protons + tags: [ rec_vector ] + - name: tru_protons + tags: [ tru_vector ] + - name: psi_rp + tags: [ psi_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 8 + lo: 0 + hi: 40 + +_components: + - &sp_components [ x1,y1 ] + - &sp2_components [ x2,y2 ] + +_tasks_args: + - &ta_rec + query: { tags: { any-in: [ rec_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_rec2 + query: { tags: { any-in: [ rec_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: sumw + - &ta_tru + query: { tags: { any-in: [ tru_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + - &ta_tru2 + query: { tags: { any-in: [ tru_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + - &ta_psi2 + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_rec, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/uQ/reco" + axes: [ *centrality ] + - args: [*ta_rec2, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u2Q2/reco" + axes: [ *centrality ] + - args: [*ta_tru, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/uQ/gen" + axes: [ *centrality ] + - args: [*ta_tru2, *ta_psi2] + n-samples: 100 + weights-type: observable + folder: "/u2Q2/gen" + axes: [ *centrality ] \ No newline at end of file From 87ea4279a50ebb514294e47e96a588cfeef8f140 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 15 Dec 2021 15:50:27 +0100 Subject: [PATCH 231/274] Fix --- .../mc-correction-auau-123-occupancy.yml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-occupancy.yml b/setups/hades/mc-correction-auau-123-occupancy.yml index 4fc53628..a91b810a 100644 --- a/setups/hades/mc-correction-auau-123-occupancy.yml +++ b/setups/hades/mc-correction-auau-123-occupancy.yml @@ -96,21 +96,21 @@ hades_analysis: - *axis_rec_protons_rapidity - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] ########################################################################### - - name: occ_protons - type: track - phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/occ_weight - norm: m - axes: - - *axis_rec_protons_pT - - *axis_rec_protons_rapidity - cuts-pid: *pid_protons_cut - cuts-quality: *good_track_cuts - qa: - - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_rec_protons_pT - - *axis_rec_protons_rapidity - - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] + - name: occ_protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/occ_weight + norm: m + axes: + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + cuts-pid: *pid_protons_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] ########################################################################### - name: sec_protons type: track From 8935b628a2a9d9053d13d6940452591797365bf6 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 16 Dec 2021 18:03:34 +0100 Subject: [PATCH 232/274] Pions and all reconstructed particles added --- .../mc-correction-auau-123-occupancy.yml | 99 ++++++++++++++----- .../mc-correlation-auau-123-occupancy.yml | 24 ++--- 2 files changed, 84 insertions(+), 39 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-occupancy.yml b/setups/hades/mc-correction-auau-123-occupancy.yml index a91b810a..948db547 100644 --- a/setups/hades/mc-correction-auau-123-occupancy.yml +++ b/setups/hades/mc-correction-auau-123-occupancy.yml @@ -4,15 +4,21 @@ _axes: - &axis_rec_protons_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_rec_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] - &axis_tru_protons_pT name: sim_particles_extra/pT bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_tru_pions_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] - &axis_rec_protons_rapidity name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 - - &axis_pions_rapidity + - &axis_rec_pions_rapidity name: mdc_vtx_tracks_extra/ycm nb: 17 lo: -0.65 @@ -22,21 +28,17 @@ _axes: nb: 15 lo: -0.75 hi: 0.75 - - &axis_gen_pions_rapidity + - &axis_tru_pions_rapidity name: sim_particles_extra/ycm nb: 17 lo: -0.65 hi: 1.05 - - &axis_theta + - &axis_rec_theta name: mdc_vtx_tracks_extra/theta nb: 12 lo: 0.3 hi: 1.5 - - &axis_gen_theta - name: sim_particles_extra/theta - nb: 12 - lo: 0.3 - hi: 1.5 + _cuts: - &pid_protons_cut mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -80,30 +82,29 @@ hades_analysis: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } q-vectors: ########################################################################### - - name: rec_protons + - name: rec_all type: track phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m axes: - - *axis_rec_protons_pT - - *axis_rec_protons_rapidity - cuts-pid: *pid_protons_cut - cuts-quality: *good_track_cuts + - *axis_rec_theta + cuts-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_rec_protons_pT - *axis_rec_protons_rapidity - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] ########################################################################### - - name: occ_protons + - name: rec_protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/occ_weight + weight: mdc_vtx_tracks_extra/efficiency norm: m axes: - *axis_rec_protons_pT - *axis_rec_protons_rapidity + - *axis_rec_theta cuts-pid: *pid_protons_cut cuts-quality: *good_track_cuts qa: @@ -111,23 +112,41 @@ hades_analysis: - *axis_rec_protons_pT - *axis_rec_protons_rapidity - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] - ########################################################################### - - name: sec_protons + ########################################################################### + - name: rec_pi_neg type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/sector_weight + weight: mdc_vtx_tracks_extra/efficiency norm: m axes: - - *axis_rec_protons_pT - - *axis_rec_protons_rapidity - cuts-pid: *pid_protons_cut + - *axis_rec_pions_pT + - *axis_rec_pions_rapidity + - *axis_rec_theta + cuts-pid: *pid_pi_neg_cut cuts-quality: *good_track_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_rec_protons_pT - - *axis_rec_protons_rapidity - - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] - ############################################################# + - *axis_rec_pions_pT + - *axis_rec_pions_rapidity + - [*axis_rec_pions_rapidity, *axis_rec_pions_pT] + ########################################################################### + - name: rec_pi_pos + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + axes: + - *axis_rec_pions_pT + - *axis_rec_pions_rapidity + - *axis_rec_theta + cuts-pid: *pid_pi_pos_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_pions_pT + - *axis_rec_pions_rapidity + - [*axis_rec_pions_rapidity, *axis_rec_pions_pT] + ########################################################################### - name: tru_protons type: track phi: sim_particles_extra/phi @@ -142,7 +161,37 @@ hades_analysis: - *axis_tru_protons_pT - *axis_tru_protons_rapidity - [*axis_tru_protons_rapidity, *axis_tru_protons_pT] + ########################################################################### + - name: tru_pi_neg + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_pions_pT + - *axis_tru_pions_rapidity + cuts-pid: *gen_prim_pi_neg_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_pions_pT + - *axis_tru_pions_rapidity + - [*axis_tru_pions_rapidity, *axis_tru_pions_pT] ########################################################################### + - name: tru_pi_pos + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_pions_pT + - *axis_tru_pions_rapidity + cuts-pid: *gen_prim_pi_pos_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_pions_pT + - *axis_tru_pions_rapidity + - [*axis_tru_pions_rapidity, *axis_tru_pions_pT] + ########################################################################### - name: psi_rp type: psi phi: sim_header/reaction_plane diff --git a/setups/hades/mc-correlation-auau-123-occupancy.yml b/setups/hades/mc-correlation-auau-123-occupancy.yml index 41da10c9..f155c7d6 100644 --- a/setups/hades/mc-correlation-auau-123-occupancy.yml +++ b/setups/hades/mc-correlation-auau-123-occupancy.yml @@ -1,12 +1,18 @@ _detectors: &detectors + - name: rec_all + tags: [ rec_vector ] - name: rec_protons tags: [ rec_vector ] - - name: occ_protons + - name: rec_pi_pos tags: [ rec_vector ] - - name: sec_protons + - name: rec_pi_neg tags: [ rec_vector ] - name: tru_protons tags: [ tru_vector ] + - name: tru_pi_pos + tags: [ tru_vector ] + - name: tru_pi_neg + tags: [ tru_vector ] - name: psi_rp tags: [ psi_vector ] @@ -62,20 +68,10 @@ _tasks: - args: [*ta_rec, *ta_psi] n-samples: 100 weights-type: observable - folder: "/uQ/reco" - axes: [ *centrality ] - - args: [*ta_rec2, *ta_psi2] - n-samples: 100 - weights-type: observable - folder: "/u2Q2/reco" + folder: "/u1Q1/rec" axes: [ *centrality ] - args: [*ta_tru, *ta_psi] n-samples: 100 weights-type: observable - folder: "/uQ/gen" - axes: [ *centrality ] - - args: [*ta_tru2, *ta_psi2] - n-samples: 100 - weights-type: observable - folder: "/u2Q2/gen" + folder: "/u1Q1/tru" axes: [ *centrality ] \ No newline at end of file From 6a5c7c50430dfa7c060fe7f6d3f733a57e135577 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 17 Dec 2021 15:27:33 +0100 Subject: [PATCH 233/274] correction and correlation setups updated --- setups/hades/correction-auau-123.yml | 130 ++++++++++++-------------- setups/hades/correlation-auau-123.yml | 50 ++-------- 2 files changed, 70 insertions(+), 110 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 8251d718..1029a2c3 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -1,17 +1,12 @@ _layouts: _axes: -# - &axis_protons_pT -# name: mdc_vtx_tracks_extra/pT -# bin-edges: [0.2, 0.29375, 0.35625, 0.41875, 0.48125, 0.54375, 0.61875, 0.70625, 0.81875, 1.01875, 1.5] - &axis_protons_pT name: mdc_vtx_tracks_extra/pT - nb: 20 - lo: 0.0 - hi: 2.0 + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] - &axis_pions_pT name: mdc_vtx_tracks_extra/pT - bin-edges: [0, 0.08, 0.105, 0.13, 0.155, 0.18, 0.21, 0.25, 0.315, 0.535, 1.0] + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm nb: 15 @@ -69,9 +64,23 @@ hades_analysis: event-variables: - event_header/selected_tof_rpc_hits_centrality axes: - - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } q-vectors: ############################################################# + - name: charged + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_theta + cuts-track-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# - name: protons type: track phi: mdc_vtx_tracks_extra/phi @@ -83,54 +92,48 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity -# - *axis_theta - cuts-pid: - *protons_cuts - cuts-quality: - *good_particle_cuts + - *axis_theta + cuts-pid: *protons_cuts + cuts-quality: *good_particle_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_protons_pT - *axis_protons_rapidity - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# -# - name: pi_pos -# type: track -# phi: mdc_vtx_tracks_extra/phi -# weight: mdc_vtx_tracks_extra/efficiency -# norm: m -# corrections: -# - recentering -# - twist-and-rescale -# axes: -# - *axis_pions_pT -# - *axis_pions_rapidity -## - *axis_theta -# cuts-quality: -# *good_particle_cuts -# cuts-pid: -# *pi_pos_cuts -# qa: -# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} -# ############################################################# -# - name: pi_neg -# type: track -# phi: mdc_vtx_tracks_extra/phi -# weight: mdc_vtx_tracks_extra/efficiency -# norm: m -# corrections: -# - recentering -# - twist-and-rescale -# axes: -# - *axis_pions_pT -# - *axis_pions_rapidity -## - *axis_theta -# cuts-quality: -# *good_particle_cuts -# cuts-pid: -# *pi_neg_cuts -# qa: -# - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - name: pi_pos + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pions_pT + - *axis_pions_rapidity + - *axis_theta + cuts-quality: *good_particle_cuts + cuts-pid: *pi_pos_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: pi_neg + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering + - twist-and-rescale + axes: + - *axis_pions_pT + - *axis_pions_rapidity + - *axis_theta + cuts-quality: *good_particle_cuts + cuts-pid: *pi_neg_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: Mf type: track @@ -140,12 +143,9 @@ hades_analysis: corrections: - recentering - twist-and-rescale - cuts-subevent: - *mf_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *protons_cuts + cuts-subevent: *mf_cuts + cuts-quality: *good_particle_cuts + cuts-pid: *protons_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# @@ -157,12 +157,9 @@ hades_analysis: corrections: - recentering - twist-and-rescale - cuts-subevent: - *mb_cuts - cuts-quality: - *good_particle_cuts - cuts-pid: - *protons_cuts + cuts-subevent: *mb_cuts + cuts-quality: *good_particle_cuts + cuts-pid: *protons_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# @@ -174,8 +171,7 @@ hades_analysis: corrections: - recentering - twist-and-rescale - cuts: - *w1_cuts + cuts: *w1_cuts ############################################################# - name: W2 type: track @@ -185,8 +181,7 @@ hades_analysis: corrections: - recentering - twist-and-rescale - cuts: - *w2_cuts + cuts: *w2_cuts ############################################################# - name: W3 type: track @@ -196,5 +191,4 @@ hades_analysis: corrections: - recentering - twist-and-rescale - cuts: - *w3_cuts \ No newline at end of file + cuts: *w3_cuts \ No newline at end of file diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 19a1770d..e784166a 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -1,4 +1,6 @@ _detectors: &detectors + - name: charged + tags: [ un_vector ] - name: protons tags: [ un_vector ] - name: pi_pos @@ -19,17 +21,14 @@ _detectors: &detectors _axes: - ¢rality name: event_header_selected_tof_rpc_hits_centrality - nb: 12 + nb: 8 lo: 0 - hi: 60 + hi: 40 _components: - - &sp_components - [ x1,y1 ] - - &sp2_components - [ x2,y2 ] - - &ep_components - [ cos1,sin1 ] + - &sp_components [ x1,y1 ] + - &sp2_components [ x2,y2 ] + - &ep_components [ cos1,sin1 ] _tasks_args: - &ta_u @@ -70,46 +69,13 @@ _tasks_args: weight: ones _tasks: - # Checks -# - args: [*ta_u] -# n-samples: 100 -# weights-type: observable -# folder: "/checks/u1" -# axes: [ *centrality ] -# - args: [*ta_u2] -# n-samples: 100 -# weights-type: observable -# folder: "/checks/u2" -# axes: [ *centrality ] -# Scalar product - args: [*ta_u, *ta_qn_sp] n-samples: 100 weights-type: observable folder: "/SP/u1Q1" axes: [ *centrality ] -# - args: [*ta_u2, *ta_qn_sp, *ta_qn_sp] -# n-samples: 100 -# weights-type: observable -# folder: "/SP/u2Q1Q1" -# axes: [ *centrality ] - args: [*ta_qn_sp, *ta_qn_sp] n-samples: 100 weights-type: reference folder: "/SP/Q1Q1" - axes: [ *centrality ] - # Event plane -# - args: [*ta_u, *ta_qn_ep] -# n-samples: 100 -# weights-type: observable -# folder: "/EP/u1Q1" -# axes: [ *centrality ] -# - args: [*ta_u2, *ta_qn_ep, *ta_qn_ep] -# n-samples: 100 -# weights-type: observable -# folder: "/EP/u2Q1Q1" -# axes: [ *centrality ] -# - args: [*ta_qn_ep, *ta_qn_ep] -# n-samples: 100 -# weights-type: reference -# folder: "/EP/Q1Q1" -# axes: [ *centrality ] \ No newline at end of file + axes: [ *centrality ] \ No newline at end of file From ea476e762a582febbd468fdc3d238c457d9572b2 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 17 Dec 2021 19:41:35 +0100 Subject: [PATCH 234/274] All fancy stuff removed. Only necessary corrections left --- setups/hades/correction-auau-123.yml | 34 +++++++++++++-------------- setups/hades/correlation-auau-123.yml | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 1029a2c3..5b9dae23 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -72,9 +72,9 @@ hades_analysis: phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m - corrections: - - recentering - - twist-and-rescale +# corrections: +# - recentering +# - twist-and-rescale axes: - *axis_theta cuts-track-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } @@ -86,9 +86,9 @@ hades_analysis: phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/efficiency norm: m - corrections: - - recentering - - twist-and-rescale +# corrections: +# - recentering +# - twist-and-rescale axes: - *axis_protons_pT - *axis_protons_rapidity @@ -106,9 +106,9 @@ hades_analysis: phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/efficiency norm: m - corrections: - - recentering - - twist-and-rescale +# corrections: +# - recentering +# - twist-and-rescale axes: - *axis_pions_pT - *axis_pions_rapidity @@ -123,9 +123,9 @@ hades_analysis: phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/efficiency norm: m - corrections: - - recentering - - twist-and-rescale +# corrections: +# - recentering +# - twist-and-rescale axes: - *axis_pions_pT - *axis_pions_rapidity @@ -142,7 +142,7 @@ hades_analysis: norm: m corrections: - recentering - - twist-and-rescale +# - twist-and-rescale cuts-subevent: *mf_cuts cuts-quality: *good_particle_cuts cuts-pid: *protons_cuts @@ -156,7 +156,7 @@ hades_analysis: norm: m corrections: - recentering - - twist-and-rescale +# - twist-and-rescale cuts-subevent: *mb_cuts cuts-quality: *good_particle_cuts cuts-pid: *protons_cuts @@ -170,7 +170,7 @@ hades_analysis: norm: m corrections: - recentering - - twist-and-rescale +# - twist-and-rescale cuts: *w1_cuts ############################################################# - name: W2 @@ -180,7 +180,7 @@ hades_analysis: norm: m corrections: - recentering - - twist-and-rescale +# - twist-and-rescale cuts: *w2_cuts ############################################################# - name: W3 @@ -190,5 +190,5 @@ hades_analysis: norm: m corrections: - recentering - - twist-and-rescale +# - twist-and-rescale cuts: *w3_cuts \ No newline at end of file diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index e784166a..3bb2df21 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -35,7 +35,7 @@ _tasks_args: query: { tags: { any-in: [ un_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ plain ] weight: sumw - &ta_u2 query: { tags: { any-in: [ un_vector ] } } @@ -47,7 +47,7 @@ _tasks_args: query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ rescaled ] + correction-steps: [ recentered ] weight: ones - &ta_qn_ep query: { tags: { any-in: [ qn_vector ] } } From f64b623b9f102e5d7c83b514ed38cf4097446092 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 20 Dec 2021 22:37:37 +0300 Subject: [PATCH 235/274] Number of dimensions decreased --- setups/hades/correction-auau-123.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 5b9dae23..d1b499e0 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -92,7 +92,6 @@ hades_analysis: axes: - *axis_protons_pT - *axis_protons_rapidity - - *axis_theta cuts-pid: *protons_cuts cuts-quality: *good_particle_cuts qa: @@ -112,7 +111,6 @@ hades_analysis: axes: - *axis_pions_pT - *axis_pions_rapidity - - *axis_theta cuts-quality: *good_particle_cuts cuts-pid: *pi_pos_cuts qa: @@ -129,7 +127,6 @@ hades_analysis: axes: - *axis_pions_pT - *axis_pions_rapidity - - *axis_theta cuts-quality: *good_particle_cuts cuts-pid: *pi_neg_cuts qa: From c5b68e3a2407b64999775594718a6eadf9a432ab Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 21 Dec 2021 20:24:05 +0300 Subject: [PATCH 236/274] 52 bins along theta axis + cut on track quality removed to match MC --- setups/hades/mc-correction-auau-123-occupancy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-occupancy.yml b/setups/hades/mc-correction-auau-123-occupancy.yml index 948db547..50f45578 100644 --- a/setups/hades/mc-correction-auau-123-occupancy.yml +++ b/setups/hades/mc-correction-auau-123-occupancy.yml @@ -35,8 +35,8 @@ _axes: hi: 1.05 - &axis_rec_theta name: mdc_vtx_tracks_extra/theta - nb: 12 - lo: 0.3 + nb: 52 + lo: 0.2 hi: 1.5 _cuts: @@ -89,7 +89,7 @@ hades_analysis: norm: m axes: - *axis_rec_theta - cuts-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } +# cuts-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_rec_protons_pT From c32f673ef455825c1a1390f26c26ba1ff0a0fcda Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 21 Dec 2021 20:24:18 +0300 Subject: [PATCH 237/274] 52 bins along theta axis + cut on track quality removed to match MC --- setups/hades/correction-auau-123.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index d1b499e0..112f2b8b 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -19,8 +19,8 @@ _axes: hi: 1.05 - &axis_theta name: mdc_vtx_tracks_extra/theta - nb: 12 - lo: 0.3 + nb: 52 + lo: 0.2 hi: 1.5 _cuts: - &protons_cuts @@ -77,7 +77,7 @@ hades_analysis: # - twist-and-rescale axes: - *axis_theta - cuts-track-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } +# cuts-track-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# From 6a91cc5494f09e6ed1ded12a8c86b205905e577c Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sun, 26 Dec 2021 19:46:19 +0300 Subject: [PATCH 238/274] Wider theta axis + pT axis added for all charged particles flow Cut on track quality for all charged particles --- setups/hades/correction-auau-123.yml | 10 ++++++---- .../hades/mc-correction-auau-123-occupancy.yml | 18 ++++++++---------- .../mc-correlation-auau-123-occupancy.yml | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 112f2b8b..53c1f69e 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -19,9 +19,9 @@ _axes: hi: 1.05 - &axis_theta name: mdc_vtx_tracks_extra/theta - nb: 52 + nb: 14 lo: 0.2 - hi: 1.5 + hi: 1.6 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -71,13 +71,15 @@ hades_analysis: type: track phi: mdc_vtx_tracks_extra/phi weight: Ones - norm: m + norm: none # corrections: # - recentering # - twist-and-rescale axes: - *axis_theta -# cuts-track-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } + - *axis_protons_pT + + cuts-track-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# diff --git a/setups/hades/mc-correction-auau-123-occupancy.yml b/setups/hades/mc-correction-auau-123-occupancy.yml index 50f45578..03055a19 100644 --- a/setups/hades/mc-correction-auau-123-occupancy.yml +++ b/setups/hades/mc-correction-auau-123-occupancy.yml @@ -35,9 +35,9 @@ _axes: hi: 1.05 - &axis_rec_theta name: mdc_vtx_tracks_extra/theta - nb: 52 + nb: 14 lo: 0.2 - hi: 1.5 + hi: 1.6 _cuts: - &pid_protons_cut @@ -82,19 +82,20 @@ hades_analysis: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } q-vectors: ########################################################################### - - name: rec_all + - name: rec_charged type: track phi: mdc_vtx_tracks_extra/phi weight: Ones - norm: m + norm: none axes: - *axis_rec_theta -# cuts-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } + - *axis_rec_protons_pT + cuts-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - *axis_rec_protons_pT - - *axis_rec_protons_rapidity - - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] + - *axis_rec_theta + - [*axis_rec_theta, *axis_rec_protons_pT] ########################################################################### - name: rec_protons type: track @@ -104,7 +105,6 @@ hades_analysis: axes: - *axis_rec_protons_pT - *axis_rec_protons_rapidity - - *axis_rec_theta cuts-pid: *pid_protons_cut cuts-quality: *good_track_cuts qa: @@ -121,7 +121,6 @@ hades_analysis: axes: - *axis_rec_pions_pT - *axis_rec_pions_rapidity - - *axis_rec_theta cuts-pid: *pid_pi_neg_cut cuts-quality: *good_track_cuts qa: @@ -138,7 +137,6 @@ hades_analysis: axes: - *axis_rec_pions_pT - *axis_rec_pions_rapidity - - *axis_rec_theta cuts-pid: *pid_pi_pos_cut cuts-quality: *good_track_cuts qa: diff --git a/setups/hades/mc-correlation-auau-123-occupancy.yml b/setups/hades/mc-correlation-auau-123-occupancy.yml index f155c7d6..034f6c4a 100644 --- a/setups/hades/mc-correlation-auau-123-occupancy.yml +++ b/setups/hades/mc-correlation-auau-123-occupancy.yml @@ -1,5 +1,5 @@ _detectors: &detectors - - name: rec_all + - name: rec_charged tags: [ rec_vector ] - name: rec_protons tags: [ rec_vector ] From 6e2e7b25804926639c9c68514b9a30731aa9a72a Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 27 Dec 2021 18:17:57 +0300 Subject: [PATCH 239/274] Normalization on multiplicity for flow of all charged particles + pT axis removed --- setups/hades/correction-auau-123.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 53c1f69e..4d631e72 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -71,14 +71,12 @@ hades_analysis: type: track phi: mdc_vtx_tracks_extra/phi weight: Ones - norm: none + norm: m # corrections: # - recentering # - twist-and-rescale axes: - *axis_theta - - *axis_protons_pT - cuts-track-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} From e8a85a623d2406ae584a833fd51b10be030cd96a Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 30 Dec 2021 22:46:06 +0300 Subject: [PATCH 240/274] - Q-vector out of pions and deutrons added - Three particles correlation added --- setups/hades/correction-auau-123.yml | 31 +++++++++++++++++++++++++-- setups/hades/correlation-auau-123.yml | 21 ++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 4d631e72..3303d76e 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -131,11 +131,38 @@ hades_analysis: cuts-pid: *pi_neg_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: pi2 + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering +# - twist-and-rescale + cuts-quality: *good_particle_cuts + cuts-pid: { mdc_vtx_tracks_extra/abs_pid: {equals: 211} } + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: D2 + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + corrections: + - recentering +# - twist-and-rescale + cuts-quality: *good_particle_cuts + cuts-pid: { mdc_vtx_tracks_extra/geant_pid: {equals: 45} } + cuts-kinematics: { mdc_vtx_tracks_extra/ycm: {range: [-0.25, 0.25]} } + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: Mf type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering @@ -149,7 +176,7 @@ hades_analysis: - name: Mb type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 3bb2df21..1f15d98b 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -17,6 +17,10 @@ _detectors: &detectors tags: [ qn_vector, mdc ] - name: Mb tags: [ qn_vector, mdc ] + - name: pi2 + tags: [ q2_vector ] + - name: D2 + tags: [ q2_vector ] _axes: - ¢rality @@ -43,6 +47,12 @@ _tasks_args: components: *sp2_components correction-steps: [ rescaled ] weight: sumw + - &ta_q2 + query: { tags: { any-in: [ q2_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ recentered ] + weight: ones - &ta_qn_sp query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors @@ -78,4 +88,15 @@ _tasks: n-samples: 100 weights-type: reference folder: "/SP/Q1Q1" + axes: [ *centrality ] + # Three particles correlations + - args: [*ta_u, *ta_q2, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u1Q2Q1" + axes: [ *centrality ] + - args: [*ta_q2, *ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/Q2Q1Q1" axes: [ *centrality ] \ No newline at end of file From 09a2a7db043f176ef956a689822484cc3c266232 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 19 Jan 2022 19:52:13 +0100 Subject: [PATCH 241/274] D2 vector replaced by second plane from produced protons --- setups/hades/correction-auau-123.yml | 13 +++++++++---- setups/hades/correlation-auau-123.yml | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/setups/hades/correction-auau-123.yml b/setups/hades/correction-auau-123.yml index 3303d76e..d8e09594 100644 --- a/setups/hades/correction-auau-123.yml +++ b/setups/hades/correction-auau-123.yml @@ -7,6 +7,11 @@ _axes: - &axis_pions_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_uniform_pT + name: mdc_vtx_tracks_extra/pT + nb: 10 + lo: 0 + hi: 2.0 - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm nb: 15 @@ -77,6 +82,7 @@ hades_analysis: # - twist-and-rescale axes: - *axis_theta + - *axis_uniform_pT cuts-track-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} @@ -145,17 +151,16 @@ hades_analysis: qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - - name: D2 + - name: p2 type: track phi: mdc_vtx_tracks_extra/phi - weight: Ones + weight: mdc_vtx_tracks_extra/efficiency norm: m corrections: - recentering # - twist-and-rescale cuts-quality: *good_particle_cuts - cuts-pid: { mdc_vtx_tracks_extra/geant_pid: {equals: 45} } - cuts-kinematics: { mdc_vtx_tracks_extra/ycm: {range: [-0.25, 0.25]} } + cuts-pid: { mdc_vtx_tracks_extra/pid: {equals: 2212} } qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# diff --git a/setups/hades/correlation-auau-123.yml b/setups/hades/correlation-auau-123.yml index 1f15d98b..fcc776ca 100644 --- a/setups/hades/correlation-auau-123.yml +++ b/setups/hades/correlation-auau-123.yml @@ -19,7 +19,7 @@ _detectors: &detectors tags: [ qn_vector, mdc ] - name: pi2 tags: [ q2_vector ] - - name: D2 + - name: p2 tags: [ q2_vector ] _axes: From 950518b2ec8f0f93adde99c9f250d0bc68c95b35 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 19 Jan 2022 20:06:02 +0100 Subject: [PATCH 242/274] Flow of true charged added + pT differentially --- .../mc-correction-auau-123-occupancy.yml | 34 +++++++++++++++++-- .../mc-correlation-auau-123-occupancy.yml | 2 ++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-occupancy.yml b/setups/hades/mc-correction-auau-123-occupancy.yml index 03055a19..239fcd00 100644 --- a/setups/hades/mc-correction-auau-123-occupancy.yml +++ b/setups/hades/mc-correction-auau-123-occupancy.yml @@ -38,6 +38,21 @@ _axes: nb: 14 lo: 0.2 hi: 1.6 + - &axis_tru_theta + name: sim_particles_extra/theta + nb: 14 + lo: 0.2 + hi: 1.6 + - &axis_rec_uniform_pT + name: mdc_vtx_tracks_extra/pT + nb: 10 + lo: 0.0 + hi: 2.0 + - &axis_tru_uniform_pT + name: sim_particles_extra/pT + nb: 10 + lo: 0.0 + hi: 2.0 _cuts: - &pid_protons_cut @@ -86,10 +101,10 @@ hades_analysis: type: track phi: mdc_vtx_tracks_extra/phi weight: Ones - norm: none + norm: m axes: - *axis_rec_theta - - *axis_rec_protons_pT + - *axis_rec_uniform_pT cuts-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} @@ -145,6 +160,21 @@ hades_analysis: - *axis_rec_pions_rapidity - [*axis_rec_pions_rapidity, *axis_rec_pions_pT] ########################################################################### + - name: tru_charged + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_theta + - *axis_tru_uniform_pT + cuts-charge: { sim_particles_extra/is_charged: {range: [0.0, 100.0]} } + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_protons_pT + - *axis_tru_protons_rapidity + - [*axis_tru_protons_rapidity, *axis_tru_protons_pT] + ########################################################################### - name: tru_protons type: track phi: sim_particles_extra/phi diff --git a/setups/hades/mc-correlation-auau-123-occupancy.yml b/setups/hades/mc-correlation-auau-123-occupancy.yml index 034f6c4a..d406eb3c 100644 --- a/setups/hades/mc-correlation-auau-123-occupancy.yml +++ b/setups/hades/mc-correlation-auau-123-occupancy.yml @@ -7,6 +7,8 @@ _detectors: &detectors tags: [ rec_vector ] - name: rec_pi_neg tags: [ rec_vector ] + - name: tru_charged + tags: [ tru_vector ] - name: tru_protons tags: [ tru_vector ] - name: tru_pi_pos From ad715d33978d67b5958ee431cb74e2d794a81540 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 21 Jan 2022 14:12:18 +0100 Subject: [PATCH 243/274] Protons weighted with occupancy weights --- setups/hades/mc-correction-auau-123-occupancy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123-occupancy.yml b/setups/hades/mc-correction-auau-123-occupancy.yml index 239fcd00..40ccc8c1 100644 --- a/setups/hades/mc-correction-auau-123-occupancy.yml +++ b/setups/hades/mc-correction-auau-123-occupancy.yml @@ -115,7 +115,7 @@ hades_analysis: - name: rec_protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/efficiency + weight: mdc_vtx_tracks_extra/occ_weight norm: m axes: - *axis_rec_protons_pT From ebb0685b075016e2cf9011e15d7213aae110a18f Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 24 Jan 2022 16:21:46 +0100 Subject: [PATCH 244/274] Configuration with only EP-s --- setups/hades/correction-auau-123-plains.yml | 103 ++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 setups/hades/correction-auau-123-plains.yml diff --git a/setups/hades/correction-auau-123-plains.yml b/setups/hades/correction-auau-123-plains.yml new file mode 100644 index 00000000..2d6da791 --- /dev/null +++ b/setups/hades/correction-auau-123-plains.yml @@ -0,0 +1,103 @@ +_layouts: + +_axes: + - &axis_protons_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_uniform_pT + name: mdc_vtx_tracks_extra/pT + nb: 10 + lo: 0 + hi: 2.0 + - &axis_protons_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_theta + name: mdc_vtx_tracks_extra/theta + nb: 14 + lo: 0.2 + hi: 1.6 +_cuts: + - &protons_cuts + mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pi_pos_cuts + mdc_vtx_tracks_extra/pid: { equals: 211 } + - &pi_neg_cuts + mdc_vtx_tracks_extra/pid: { equals: -211 } + - &good_particle_cuts + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + - &mf_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} + - &mb_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} + - &r1_cuts + forward_wall_hits/rnd_sub: { equals: 0 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &r2_cuts + forward_wall_hits/rnd_sub: { equals: 1 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/beta: { range: [0.84, 1.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/beta: { range: [0.85, 1.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/beta: { range: [0.80, 1.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } + q-vectors: + ############################################################# + - name: W1 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m + corrections: + - recentering +# - twist-and-rescale + cuts: *w1_cuts + ############################################################# + - name: W2 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m + corrections: + - recentering +# - twist-and-rescale + cuts: *w2_cuts + ############################################################# + - name: W3 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m + corrections: + - recentering +# - twist-and-rescale + cuts: *w3_cuts \ No newline at end of file From a8b084da63b74b33e53fe769c473ab5695989038 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 25 Jan 2022 11:29:57 +0100 Subject: [PATCH 245/274] Configuration with only EP-s --- .../hades/mc-correction-auau-123-plains.yml | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 setups/hades/mc-correction-auau-123-plains.yml diff --git a/setups/hades/mc-correction-auau-123-plains.yml b/setups/hades/mc-correction-auau-123-plains.yml new file mode 100644 index 00000000..2678424a --- /dev/null +++ b/setups/hades/mc-correction-auau-123-plains.yml @@ -0,0 +1,104 @@ +_layouts: + +_axes: + - &axis_rec_protons_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_rec_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_tru_protons_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_tru_pions_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_rec_protons_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_rec_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_tru_protons_rapidity + name: sim_particles_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_tru_pions_rapidity + name: sim_particles_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_rec_theta + name: mdc_vtx_tracks_extra/theta + nb: 14 + lo: 0.2 + hi: 1.6 + - &axis_tru_theta + name: sim_particles_extra/theta + nb: 14 + lo: 0.2 + hi: 1.6 + - &axis_rec_uniform_pT + name: mdc_vtx_tracks_extra/pT + nb: 10 + lo: 0.0 + hi: 2.0 + - &axis_tru_uniform_pT + name: sim_particles_extra/pT + nb: 10 + lo: 0.0 + hi: 2.0 + +_cuts: + - &pid_protons_cut + mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pid_pi_pos_cut + mdc_vtx_tracks_extra/pid: { equals: 211 } + - &pid_pi_neg_cut + mdc_vtx_tracks_extra/pid: { equals: -211 } + - &mf_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} + - &mb_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} + - &gen_prim_protons_cut + sim_particles_extra/pid: { equals: 2212 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_pos_cut + sim_particles_extra/pid: { equals: 211 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_neg_cut + sim_particles_extra/pid: { equals: -211 } + sim_particles_extra/is_primary: { equals: 1 } + - &good_track_cuts + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } + q-vectors: + ########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag \ No newline at end of file From f89086c083e99968a0299ceefdddfe9547cfdcc1 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 25 Jan 2022 12:40:26 +0100 Subject: [PATCH 246/274] Full wall added --- setups/hades/correction-auau-123-plains.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-plains.yml b/setups/hades/correction-auau-123-plains.yml index 2d6da791..bfe26f1d 100644 --- a/setups/hades/correction-auau-123-plains.yml +++ b/setups/hades/correction-auau-123-plains.yml @@ -52,6 +52,10 @@ _cuts: forward_wall_hits/rnd_sub: { equals: 1 } forward_wall_hits/time: { range: [22.681788, 28.352235] } forward_wall_hits/signal: { range: [80.0, 999.0] } + - &wall_cuts + forward_wall_hits/rnd_sub: { equals: 1 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } - &w1_cuts forward_wall_hits/ring: { range: [1.0, 5.0] } forward_wall_hits/beta: { range: [0.84, 1.0] } @@ -100,4 +104,14 @@ hades_analysis: corrections: - recentering # - twist-and-rescale - cuts: *w3_cuts \ No newline at end of file + cuts: *w3_cuts + ############################################################# + - name: Wall + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m + corrections: + - recentering +# - twist-and-rescale + cuts: *wall_cuts \ No newline at end of file From 2e46872d171b4ae72e3f37b3c54d91b8b5770978 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 25 Jan 2022 15:09:09 +0100 Subject: [PATCH 247/274] MC-setup for occupancy checks --- .../hades/mc-correction-auau-123-pT-theta.yml | 227 ++++++++++++++++++ 1 file changed, 227 insertions(+) create mode 100644 setups/hades/mc-correction-auau-123-pT-theta.yml diff --git a/setups/hades/mc-correction-auau-123-pT-theta.yml b/setups/hades/mc-correction-auau-123-pT-theta.yml new file mode 100644 index 00000000..fdeacc53 --- /dev/null +++ b/setups/hades/mc-correction-auau-123-pT-theta.yml @@ -0,0 +1,227 @@ +_layouts: + +_axes: + - &axis_rec_protons_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_rec_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_tru_protons_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_tru_pions_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_rec_protons_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_rec_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_tru_protons_rapidity + name: sim_particles_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_tru_pions_rapidity + name: sim_particles_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_rec_theta + name: mdc_vtx_tracks_extra/theta + nb: 14 + lo: 0.2 + hi: 1.6 + - &axis_tru_theta + name: sim_particles_extra/theta + nb: 14 + lo: 0.2 + hi: 1.6 + - &axis_rec_uniform_pT + name: mdc_vtx_tracks_extra/pT + nb: 15 + lo: 0.0 + hi: 1.5 + - &axis_tru_uniform_pT + name: sim_particles_extra/pT + nb: 15 + lo: 0.0 + hi: 1.5 + +_cuts: + - &pid_protons_cut + mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pid_pi_pos_cut + mdc_vtx_tracks_extra/pid: { equals: 211 } + - &pid_pi_neg_cut + mdc_vtx_tracks_extra/pid: { equals: -211 } + - &mf_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} + - &mb_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} + - &gen_prim_protons_cut + sim_particles_extra/pid: { equals: 2212 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_pos_cut + sim_particles_extra/pid: { equals: 211 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_neg_cut + sim_particles_extra/pid: { equals: -211 } + sim_particles_extra/is_primary: { equals: 1 } + - &good_track_cuts + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } + q-vectors: + ########################################################################### + - name: rec_charged + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + axes: + - *axis_rec_theta + - *axis_rec_uniform_pT + cuts-quality: { mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} } + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_protons_pT + - *axis_rec_theta + - [*axis_rec_theta, *axis_rec_protons_pT] + ########################################################################### + - name: rec_protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/occ_weight + norm: m + axes: + - *axis_rec_theta + - *axis_rec_uniform_pT + cuts-pid: *pid_protons_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] + ########################################################################### + - name: rec_pi_neg + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + axes: + - *axis_rec_theta + - *axis_rec_uniform_pT + cuts-pid: *pid_pi_neg_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_pions_pT + - *axis_rec_pions_rapidity + - [*axis_rec_pions_rapidity, *axis_rec_pions_pT] + ########################################################################### + - name: rec_pi_pos + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + axes: + - *axis_rec_theta + - *axis_rec_uniform_pT + cuts-pid: *pid_pi_pos_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_pions_pT + - *axis_rec_pions_rapidity + - [*axis_rec_pions_rapidity, *axis_rec_pions_pT] + ########################################################################### + - name: tru_charged + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_theta + - *axis_tru_uniform_pT + cuts-charge: { sim_particles_extra/is_charged: {range: [0.0, 100.0]} } + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_protons_pT + - *axis_tru_protons_rapidity + - [*axis_tru_protons_rapidity, *axis_tru_protons_pT] + ########################################################################### + - name: tru_protons + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_theta + - *axis_tru_uniform_pT + cuts-pid: *gen_prim_protons_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_protons_pT + - *axis_tru_protons_rapidity + - [*axis_tru_protons_rapidity, *axis_tru_protons_pT] + ########################################################################### + - name: tru_pi_neg + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_theta + - *axis_tru_uniform_pT + cuts-pid: *gen_prim_pi_neg_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_pions_pT + - *axis_tru_pions_rapidity + - [*axis_tru_pions_rapidity, *axis_tru_pions_pT] + ########################################################################### + - name: tru_pi_pos + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_theta + - *axis_tru_uniform_pT + cuts-pid: *gen_prim_pi_pos_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_pions_pT + - *axis_tru_pions_rapidity + - [*axis_tru_pions_rapidity, *axis_tru_pions_pT] + ########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag \ No newline at end of file From a1753213db55dfa804d6d4fbdb67808f2205a487 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 25 Jan 2022 17:41:51 +0100 Subject: [PATCH 248/274] Efficiency instead of occupancy as a weight for protons --- setups/hades/mc-correction-auau-123-pT-theta.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123-pT-theta.yml b/setups/hades/mc-correction-auau-123-pT-theta.yml index fdeacc53..13ea5d8f 100644 --- a/setups/hades/mc-correction-auau-123-pT-theta.yml +++ b/setups/hades/mc-correction-auau-123-pT-theta.yml @@ -115,7 +115,7 @@ hades_analysis: - name: rec_protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/occ_weight + weight: mdc_vtx_tracks_extra/efficiency norm: m axes: - *axis_rec_theta From 591dd0c28cb27f10625efa7e239c57d5df59a401 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 27 Jan 2022 14:33:45 +0100 Subject: [PATCH 249/274] light-weighted configuration to test occupancy correction --- .../hades/correction-auau-123-occupancy.yml | 147 ++++++++++++++++++ .../hades/correlation-auau-123-occupancy.yml | 50 ++++++ 2 files changed, 197 insertions(+) create mode 100644 setups/hades/correction-auau-123-occupancy.yml create mode 100644 setups/hades/correlation-auau-123-occupancy.yml diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml new file mode 100644 index 00000000..55e1b05d --- /dev/null +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -0,0 +1,147 @@ +_layouts: + +_axes: + - &axis_protons_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_uniform_pT + name: mdc_vtx_tracks_extra/pT + nb: 10 + lo: 0 + hi: 2.0 + - &axis_protons_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_theta + name: mdc_vtx_tracks_extra/theta + nb: 14 + lo: 0.2 + hi: 1.6 +_cuts: + - &protons_cuts + mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pi_pos_cuts + mdc_vtx_tracks_extra/pid: { equals: 211 } + - &pi_neg_cuts + mdc_vtx_tracks_extra/pid: { equals: -211 } + - &good_particle_cuts + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + - &mf_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} + - &mb_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} + - &r1_cuts + forward_wall_hits/rnd_sub: { equals: 0 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &r2_cuts + forward_wall_hits/rnd_sub: { equals: 1 } + forward_wall_hits/time: { range: [22.681788, 28.352235] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/beta: { range: [0.84, 1.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/beta: { range: [0.85, 1.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/beta: { range: [0.80, 1.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } + q-vectors: + ############################################################# + - name: protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/occ_weight + norm: m + axes: + - *axis_protons_pT + - *axis_protons_rapidity + cuts-pid: *protons_cuts + cuts-quality: *good_particle_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_protons_pT + - *axis_protons_rapidity + - [*axis_protons_rapidity, *axis_protons_pT] + ############################################################# + - name: Mf + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering +# - twist-and-rescale + cuts-subevent: *mf_cuts + cuts-quality: *good_particle_cuts + cuts-pid: *protons_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: Mb + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + corrections: + - recentering +# - twist-and-rescale + cuts-subevent: *mb_cuts + cuts-quality: *good_particle_cuts + cuts-pid: *protons_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: W1 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m + corrections: + - recentering +# - twist-and-rescale + cuts: *w1_cuts + ############################################################# + - name: W2 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m + corrections: + - recentering +# - twist-and-rescale + cuts: *w2_cuts + ############################################################# + - name: W3 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m + corrections: + - recentering +# - twist-and-rescale + cuts: *w3_cuts \ No newline at end of file diff --git a/setups/hades/correlation-auau-123-occupancy.yml b/setups/hades/correlation-auau-123-occupancy.yml new file mode 100644 index 00000000..f323bfee --- /dev/null +++ b/setups/hades/correlation-auau-123-occupancy.yml @@ -0,0 +1,50 @@ +_detectors: &detectors + - name: protons + tags: [ un_vector ] + - name: W1 + tags: [ qn_vector ] + - name: W2 + tags: [ qn_vector ] + - name: W3 + tags: [ qn_vector ] + - name: Mf + tags: [ qn_vector, mdc ] + - name: Mb + tags: [ qn_vector, mdc ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 8 + lo: 0 + hi: 40 + +_components: + - &sp_components [ x1,y1 ] + +_tasks_args: + - &ta_u + query: { tags: { any-in: [ un_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_qn_sp + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ recentered ] + weight: ones + +_tasks: + # Two particles correlations + - args: [*ta_u, *ta_qn_sp] + n-samples: 100 + weights-type: observable + folder: "/SP/u1Q1" + axes: [ *centrality ] + - args: [*ta_qn_sp, *ta_qn_sp] + n-samples: 100 + weights-type: reference + folder: "/SP/Q1Q1" + axes: [ *centrality ] \ No newline at end of file From bec6cd888542207135e3cc698bb5d7f32bbb15ff Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 28 Jan 2022 14:22:37 +0100 Subject: [PATCH 250/274] Optimization of efficiency calculation parameters --- .../hades/correction-auau-123-occupancy.yml | 50 ++++++------------- 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index 55e1b05d..406006c3 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -4,36 +4,21 @@ _axes: - &axis_protons_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] - - &axis_pions_pT - name: mdc_vtx_tracks_extra/pT - bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] - - &axis_uniform_pT - name: mdc_vtx_tracks_extra/pT - nb: 10 - lo: 0 - hi: 2.0 - &axis_protons_rapidity name: mdc_vtx_tracks_extra/ycm nb: 15 lo: -0.75 hi: 0.75 - - &axis_pions_rapidity - name: mdc_vtx_tracks_extra/ycm - nb: 17 - lo: -0.65 - hi: 1.05 - - &axis_theta - name: mdc_vtx_tracks_extra/theta - nb: 14 - lo: 0.2 - hi: 1.6 + - &axis_protons_c_eff + name: mdc_vtx_tracks_extra/c_eff + nb: 16 + lo: 0.001 + hi: 0.005 _cuts: + - &midrapidity_cuts + mdc_vtx_tracks_extra/ycm: { range: [-0.05, 0.05] } - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } - - &pi_pos_cuts - mdc_vtx_tracks_extra/pid: { equals: 211 } - - &pi_neg_cuts - mdc_vtx_tracks_extra/pid: { equals: -211 } - &good_particle_cuts mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} @@ -44,14 +29,6 @@ _cuts: - &mb_cuts mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} - - &r1_cuts - forward_wall_hits/rnd_sub: { equals: 0 } - forward_wall_hits/time: { range: [22.681788, 28.352235] } - forward_wall_hits/signal: { range: [80.0, 999.0] } - - &r2_cuts - forward_wall_hits/rnd_sub: { equals: 1 } - forward_wall_hits/time: { range: [22.681788, 28.352235] } - forward_wall_hits/signal: { range: [80.0, 999.0] } - &w1_cuts forward_wall_hits/ring: { range: [1.0, 5.0] } forward_wall_hits/beta: { range: [0.84, 1.0] } @@ -71,7 +48,7 @@ hades_analysis: axes: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } q-vectors: - ############################################################# + ############################################################# - name: protons type: track phi: mdc_vtx_tracks_extra/phi @@ -79,8 +56,9 @@ hades_analysis: norm: m axes: - *axis_protons_pT - - *axis_protons_rapidity + - *axis_protons_c_eff cuts-pid: *protons_cuts + cuts-midrapidity: *midrapidity_cuts cuts-quality: *good_particle_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} @@ -101,7 +79,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - ############################################################# + ############################################################# - name: Mb type: track phi: mdc_vtx_tracks_extra/phi @@ -115,7 +93,7 @@ hades_analysis: cuts-pid: *protons_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - ############################################################# + ############################################################# - name: W1 type: track phi: forward_wall_hits/phi @@ -125,7 +103,7 @@ hades_analysis: - recentering # - twist-and-rescale cuts: *w1_cuts - ############################################################# + ############################################################# - name: W2 type: track phi: forward_wall_hits/phi @@ -135,7 +113,7 @@ hades_analysis: - recentering # - twist-and-rescale cuts: *w2_cuts - ############################################################# + ############################################################# - name: W3 type: track phi: forward_wall_hits/phi From 9a458b55e949eb0b86230f328410787c946bbcfd Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 28 Jan 2022 19:00:27 +0100 Subject: [PATCH 251/274] Rapidity axis added --- setups/hades/correction-auau-123-occupancy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index 406006c3..c5cca2e8 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -11,8 +11,8 @@ _axes: hi: 0.75 - &axis_protons_c_eff name: mdc_vtx_tracks_extra/c_eff - nb: 16 - lo: 0.001 + nb: 10 + lo: 0.003 hi: 0.005 _cuts: - &midrapidity_cuts @@ -56,6 +56,7 @@ hades_analysis: norm: m axes: - *axis_protons_pT + - *axis_protons_rapidity - *axis_protons_c_eff cuts-pid: *protons_cuts cuts-midrapidity: *midrapidity_cuts From 0eac9f4b6607588de99f89c41d468e8f048bd63d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 31 Jan 2022 14:05:28 +0100 Subject: [PATCH 252/274] Cut fix --- setups/hades/correction-auau-123-occupancy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index c5cca2e8..a9c97e74 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -59,7 +59,6 @@ hades_analysis: - *axis_protons_rapidity - *axis_protons_c_eff cuts-pid: *protons_cuts - cuts-midrapidity: *midrapidity_cuts cuts-quality: *good_particle_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} From 7044f02b55929bb2ef247ac477a8738dc765d78d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 31 Jan 2022 14:28:15 +0100 Subject: [PATCH 253/274] Q-vectors are not corrected --- setups/hades/correlation-auau-123-occupancy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correlation-auau-123-occupancy.yml b/setups/hades/correlation-auau-123-occupancy.yml index f323bfee..aae00c02 100644 --- a/setups/hades/correlation-auau-123-occupancy.yml +++ b/setups/hades/correlation-auau-123-occupancy.yml @@ -33,7 +33,7 @@ _tasks_args: query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ recentered ] + correction-steps: [ plain ] weight: ones _tasks: From a4845f86928724afb197db907e6ba311e75ffa83 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Mon, 31 Jan 2022 15:47:17 +0100 Subject: [PATCH 254/274] Optimization axis range changed --- setups/hades/correction-auau-123-occupancy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index a9c97e74..03af7c94 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -12,8 +12,8 @@ _axes: - &axis_protons_c_eff name: mdc_vtx_tracks_extra/c_eff nb: 10 - lo: 0.003 - hi: 0.005 + lo: 0.005 + hi: 0.007 _cuts: - &midrapidity_cuts mdc_vtx_tracks_extra/ycm: { range: [-0.05, 0.05] } From 98554c1f2273e67445e0dfb3b99c92af288ee44e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 1 Feb 2022 14:26:04 +0100 Subject: [PATCH 255/274] Optimization of pions coefficient --- .../hades/correction-auau-123-occupancy.yml | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index 03af7c94..ccfbdc92 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -1,6 +1,9 @@ _layouts: _axes: + ############## + # Protons axes + ############## - &axis_protons_pT name: mdc_vtx_tracks_extra/pT bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] @@ -14,11 +17,27 @@ _axes: nb: 10 lo: 0.005 hi: 0.007 + ############ + # Pions axes + ############ + - &axis_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_pions_c_eff + name: mdc_vtx_tracks_extra/c_eff + nb: 10 + lo: -0.005 + hi: 0.095 _cuts: - - &midrapidity_cuts - mdc_vtx_tracks_extra/ycm: { range: [-0.05, 0.05] } - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pi_neg_cuts + mdc_vtx_tracks_extra/pid: { equals: -211 } - &good_particle_cuts mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} @@ -49,22 +68,19 @@ hades_analysis: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } q-vectors: ############################################################# - - name: protons + - name: pi_neg type: track phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/occ_weight norm: m axes: - - *axis_protons_pT - - *axis_protons_rapidity - - *axis_protons_c_eff - cuts-pid: *protons_cuts + - *axis_pions_pT + - *axis_pions_rapidity + - *axis_pions_c_eff cuts-quality: *good_particle_cuts + cuts-pid: *pi_neg_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} - - *axis_protons_pT - - *axis_protons_rapidity - - [*axis_protons_rapidity, *axis_protons_pT] ############################################################# - name: Mf type: track From 38a8f295e0108b2d5132a26f9fe714ea3a159dd9 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 1 Feb 2022 14:27:18 +0100 Subject: [PATCH 256/274] Optimization of pions coefficient --- setups/hades/correlation-auau-123-occupancy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correlation-auau-123-occupancy.yml b/setups/hades/correlation-auau-123-occupancy.yml index aae00c02..eea561a6 100644 --- a/setups/hades/correlation-auau-123-occupancy.yml +++ b/setups/hades/correlation-auau-123-occupancy.yml @@ -1,5 +1,5 @@ _detectors: &detectors - - name: protons + - name: pi_neg tags: [ un_vector ] - name: W1 tags: [ qn_vector ] From 508b2ade7faaaf89ae22bd5ca7c1263c9fe3e9ca Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 1 Feb 2022 14:36:18 +0100 Subject: [PATCH 257/274] Fix of axis --- setups/hades/correction-auau-123-occupancy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index ccfbdc92..b56e2fda 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -30,9 +30,9 @@ _axes: hi: 1.05 - &axis_pions_c_eff name: mdc_vtx_tracks_extra/c_eff - nb: 10 - lo: -0.005 - hi: 0.095 + nb: 5 + lo: 0.0 + hi: 0.1 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } From c3f2f3ed19f03dc0b9f44d4a9ff63c3f213d657e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Tue, 1 Feb 2022 18:48:17 +0100 Subject: [PATCH 258/274] Optimization axis range changed --- setups/hades/correction-auau-123-occupancy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index b56e2fda..af5a4d7f 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -30,9 +30,9 @@ _axes: hi: 1.05 - &axis_pions_c_eff name: mdc_vtx_tracks_extra/c_eff - nb: 5 - lo: 0.0 - hi: 0.1 + nb: 10 + lo: 0.07 + hi: 0.09 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } From e4cd4e9db7f8d9127922fa789e6b6bed2406135a Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 2 Feb 2022 11:17:20 +0100 Subject: [PATCH 259/274] Optimization of positive pions --- setups/hades/correction-auau-123-occupancy.yml | 11 +++++------ setups/hades/correlation-auau-123-occupancy.yml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index af5a4d7f..9b79c471 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -30,9 +30,9 @@ _axes: hi: 1.05 - &axis_pions_c_eff name: mdc_vtx_tracks_extra/c_eff - nb: 10 - lo: 0.07 - hi: 0.09 + nb: 5 + lo: 0.0 + hi: 0.1 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -68,7 +68,7 @@ hades_analysis: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } q-vectors: ############################################################# - - name: pi_neg + - name: pi_pos type: track phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/occ_weight @@ -76,9 +76,8 @@ hades_analysis: axes: - *axis_pions_pT - *axis_pions_rapidity - - *axis_pions_c_eff cuts-quality: *good_particle_cuts - cuts-pid: *pi_neg_cuts + cuts-pid: *pi_pos_cuts qa: - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# diff --git a/setups/hades/correlation-auau-123-occupancy.yml b/setups/hades/correlation-auau-123-occupancy.yml index eea561a6..613f9c48 100644 --- a/setups/hades/correlation-auau-123-occupancy.yml +++ b/setups/hades/correlation-auau-123-occupancy.yml @@ -1,5 +1,5 @@ _detectors: &detectors - - name: pi_neg + - name: pi_pos tags: [ un_vector ] - name: W1 tags: [ qn_vector ] From 007df659a23897b750c5dc4ac6c8170b3343a29b Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 2 Feb 2022 13:06:44 +0100 Subject: [PATCH 260/274] Fix --- setups/hades/correction-auau-123-occupancy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index 9b79c471..fef0f1c3 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -38,6 +38,8 @@ _cuts: mdc_vtx_tracks_extra/pid: { equals: 2212 } - &pi_neg_cuts mdc_vtx_tracks_extra/pid: { equals: -211 } + - &pi_pos_cuts + mdc_vtx_tracks_extra/pid: { equals: 211 } - &good_particle_cuts mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} From 154771397624496a249b8163b06302371ca73394 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Wed, 2 Feb 2022 13:18:44 +0100 Subject: [PATCH 261/274] Fix --- setups/hades/correction-auau-123-occupancy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index fef0f1c3..6f36e95c 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -78,6 +78,7 @@ hades_analysis: axes: - *axis_pions_pT - *axis_pions_rapidity + - *axis_pions_c_eff cuts-quality: *good_particle_cuts cuts-pid: *pi_pos_cuts qa: From 626133ed5cc93327f92de4a1b4dc17dfcad6d699 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 3 Feb 2022 10:59:39 +0100 Subject: [PATCH 262/274] 10 bins --- setups/hades/correction-auau-123-occupancy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index 6f36e95c..26f11371 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -30,7 +30,7 @@ _axes: hi: 1.05 - &axis_pions_c_eff name: mdc_vtx_tracks_extra/c_eff - nb: 5 + nb: 10 lo: 0.0 hi: 0.1 _cuts: From 5f40bd2d2739e69f2e506211a00b59c8539719a1 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 3 Feb 2022 11:29:02 +0100 Subject: [PATCH 263/274] Smaller bins on a narrower range --- setups/hades/correction-auau-123-occupancy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index 26f11371..e5706e3a 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -30,9 +30,9 @@ _axes: hi: 1.05 - &axis_pions_c_eff name: mdc_vtx_tracks_extra/c_eff - nb: 10 - lo: 0.0 - hi: 0.1 + nb: 5 + lo: 0.2 + hi: 0.7 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } From a47a24fff93f46c878695b2b82cdffec7b1500ad Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 3 Feb 2022 13:22:22 +0100 Subject: [PATCH 264/274] Fix --- setups/hades/correction-auau-123-occupancy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index e5706e3a..a1218e7e 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -31,8 +31,8 @@ _axes: - &axis_pions_c_eff name: mdc_vtx_tracks_extra/c_eff nb: 5 - lo: 0.2 - hi: 0.7 + lo: 0.02 + hi: 0.07 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } From cf169a0bc756f534ed5a741aff9a82720ce2cbb3 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 3 Feb 2022 14:03:38 +0100 Subject: [PATCH 265/274] Setup for full MC with FW simulation --- setups/hades/mc-correction-auau-123-wall.yml | 235 ++++++++++++++++++ setups/hades/mc-correlation-auau-123-wall.yml | 99 ++++++++ 2 files changed, 334 insertions(+) create mode 100644 setups/hades/mc-correction-auau-123-wall.yml create mode 100644 setups/hades/mc-correlation-auau-123-wall.yml diff --git a/setups/hades/mc-correction-auau-123-wall.yml b/setups/hades/mc-correction-auau-123-wall.yml new file mode 100644 index 00000000..a72bee0c --- /dev/null +++ b/setups/hades/mc-correction-auau-123-wall.yml @@ -0,0 +1,235 @@ +_layouts: + +_axes: + - &axis_rec_protons_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_rec_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_tru_protons_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_tru_pions_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_rec_protons_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_rec_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_tru_protons_rapidity + name: sim_particles_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_tru_pions_rapidity + name: sim_particles_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 +_cuts: + - &pid_protons_cut + mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pid_pi_pos_cut + mdc_vtx_tracks_extra/pid: { equals: 211 } + - &pid_pi_neg_cut + mdc_vtx_tracks_extra/pid: { equals: -211 } + - &mf_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} + - &mb_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} + - &gen_prim_protons_cut + sim_particles_extra/pid: { equals: 2212 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_pos_cut + sim_particles_extra/pid: { equals: 211 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_neg_cut + sim_particles_extra/pid: { equals: -211 } + sim_particles_extra/is_primary: { equals: 1 } + - &good_track_cuts + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + q-vectors: + ########################################################################### + - name: rec_protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + axes: + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + cuts-pid: *pid_protons_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] + ########################################################################### + - name: rec_pi_neg + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + axes: + - *axis_rec_pions_pT + - *axis_rec_pions_rapidity + cuts-pid: *pid_pi_neg_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_pions_pT + - *axis_rec_pions_rapidity + - [*axis_rec_pions_rapidity, *axis_rec_pions_pT] + ########################################################################### + - name: rec_pi_pos + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + axes: + - *axis_rec_pions_pT + - *axis_rec_pions_rapidity + cuts-pid: *pid_pi_pos_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_pions_pT + - *axis_rec_pions_rapidity + - [*axis_rec_pions_rapidity, *axis_rec_pions_pT] + ########################################################################### + - name: tru_protons + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_protons_pT + - *axis_tru_protons_rapidity + cuts-pid: *gen_prim_protons_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_protons_pT + - *axis_tru_protons_rapidity + - [*axis_tru_protons_rapidity, *axis_tru_protons_pT] + ########################################################################### + - name: tru_pi_neg + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_pions_pT + - *axis_tru_pions_rapidity + cuts-pid: *gen_prim_pi_neg_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_pions_pT + - *axis_tru_pions_rapidity + - [*axis_tru_pions_rapidity, *axis_tru_pions_pT] + ########################################################################### + - name: tru_pi_pos + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_pions_pT + - *axis_tru_pions_rapidity + cuts-pid: *gen_prim_pi_pos_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_pions_pT + - *axis_tru_pions_rapidity + - [*axis_tru_pions_rapidity, *axis_tru_pions_pT] + ########################################################################## + - name: Mf + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + corrections: + - recentering + cuts-subevent: *mf_cuts + cuts-quality: *good_track_cuts + cuts-pid: *pid_protons_cut + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: Mb + type: track + phi: mdc_vtx_tracks_extra/phi + weight: Ones + norm: m + corrections: + - recentering + cuts-subevent: *mb_cuts + cuts-quality: *good_track_cuts + cuts-pid: *pid_protons_cut + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ########################################################################### + - name: W1 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m + corrections: + - recentering + cuts-w1: *w1_cuts + qa: + - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + ########################################################################### + - name: W2 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m + corrections: + - recentering + cuts-w2: *w2_cuts + qa: + - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + ########################################################################### + - name: W3 + type: track + phi: forward_wall_hits/phi + weight: forward_wall_hits/signal + norm: m + corrections: + - recentering + cuts-w3: *w3_cuts + qa: + - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + ########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag \ No newline at end of file diff --git a/setups/hades/mc-correlation-auau-123-wall.yml b/setups/hades/mc-correlation-auau-123-wall.yml new file mode 100644 index 00000000..c72c4fad --- /dev/null +++ b/setups/hades/mc-correlation-auau-123-wall.yml @@ -0,0 +1,99 @@ +_detectors: &detectors +# ************************** +# particles vectors + - name: rec_protons + tags: [ rec_vector ] + - name: rec_pi_pos + tags: [ rec_vector ] + - name: rec_pi_neg + tags: [ rec_vector ] + - name: tru_protons + tags: [ tru_vector ] + - name: tru_pi_pos + tags: [ tru_vector ] + - name: tru_pi_neg + tags: [ tru_vector ] +# ************************** +# reference vectors + - name: W1 + tags: [ qn_vector ] + - name: W2 + tags: [ qn_vector ] + - name: W3 + tags: [ qn_vector ] + - name: Mf + tags: [ qn_vector ] + - name: Mb + tags: [ qn_vector ] +# ************************** +# tru reaction plane + - name: psi_rp + tags: [ psi_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 8 + lo: 0 + hi: 40 + +_components: + - &sp_components [ x1,y1 ] + +_tasks_args: + - &ta_rec + query: { tags: { any-in: [ rec_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_tru + query: { tags: { any-in: [ tru_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_qn + query: { tags: { any-in: [ qn_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ recentered ] + weight: ones + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_rec, *ta_qn] + n-samples: 100 + weights-type: observable + folder: "/u1Q1/rec" + axes: [ *centrality ] + - args: [*ta_rec, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/u1Q1/rec" + axes: [ *centrality ] + - args: [*ta_tru, *ta_qn] + n-samples: 100 + weights-type: observable + folder: "/u1Q1/tru" + axes: [ *centrality ] + - args: [*ta_tru, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/u1Q1/tru" + axes: [ *centrality ] + - args: [*ta_qn, *ta_qn] + n-samples: 100 + weights-type: reference + folder: "/Q1Q1/" + axes: [ *centrality ] + - args: [*ta_qn, *ta_psi] + n-samples: 100 + weights-type: reference + folder: "/Q1Q1/" + axes: [ *centrality ] \ No newline at end of file From 4c4eb757eb6e9642f3177bfb99afaef0d0c8465e Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 3 Feb 2022 18:25:28 +0100 Subject: [PATCH 266/274] Trying to fix --- setups/hades/mc-correction-auau-123-wall.yml | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-wall.yml b/setups/hades/mc-correction-auau-123-wall.yml index a72bee0c..0ca633ea 100644 --- a/setups/hades/mc-correction-auau-123-wall.yml +++ b/setups/hades/mc-correction-auau-123-wall.yml @@ -73,12 +73,12 @@ hades_analysis: event-variables: - event_header/selected_tof_rpc_hits_centrality axes: - - { name: event_header/selected_tof_rpc_hits_centrality, nb: 12, lo: 0.0, hi: 60 } + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } q-vectors: ########################################################################### - name: rec_protons type: track - phi: mdc_vtx_tracks_extra/phi + phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/efficiency norm: m axes: @@ -94,7 +94,7 @@ hades_analysis: ########################################################################### - name: rec_pi_neg type: track - phi: mdc_vtx_tracks_extra/phi + phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/efficiency norm: m axes: @@ -110,7 +110,7 @@ hades_analysis: ########################################################################### - name: rec_pi_pos type: track - phi: mdc_vtx_tracks_extra/phi + phi: mdc_vtx_tracks_extra/phi weight: mdc_vtx_tracks_extra/efficiency norm: m axes: @@ -126,7 +126,7 @@ hades_analysis: ########################################################################### - name: tru_protons type: track - phi: sim_particles_extra/phi + phi: sim_particles_extra/phi weight: Ones norm: m axes: @@ -141,7 +141,7 @@ hades_analysis: ########################################################################### - name: tru_pi_neg type: track - phi: sim_particles_extra/phi + phi: sim_particles_extra/phi weight: Ones norm: m axes: @@ -156,7 +156,7 @@ hades_analysis: ########################################################################### - name: tru_pi_pos type: track - phi: sim_particles_extra/phi + phi: sim_particles_extra/phi weight: Ones norm: m axes: @@ -171,7 +171,7 @@ hades_analysis: ########################################################################## - name: Mf type: track - phi: mdc_vtx_tracks_extra/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -184,7 +184,7 @@ hades_analysis: ############################################################# - name: Mb type: track - phi: mdc_vtx_tracks_extra/phi + phi: mdc_vtx_tracks_extra/phi weight: Ones norm: m corrections: @@ -197,7 +197,7 @@ hades_analysis: ########################################################################### - name: W1 type: track - phi: forward_wall_hits/phi + phi: forward_wall_hits/phi weight: forward_wall_hits/signal norm: m corrections: @@ -208,7 +208,7 @@ hades_analysis: ########################################################################### - name: W2 type: track - phi: forward_wall_hits/phi + phi: forward_wall_hits/phi weight: forward_wall_hits/signal norm: m corrections: @@ -219,7 +219,7 @@ hades_analysis: ########################################################################### - name: W3 type: track - phi: forward_wall_hits/phi + phi: forward_wall_hits/phi weight: forward_wall_hits/signal norm: m corrections: From 04dc0a3ffb6162c821b2a16a4ac351cc2ea22f4d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 3 Feb 2022 18:27:25 +0100 Subject: [PATCH 267/274] Fix --- setups/hades/mc-correction-auau-123-wall.yml | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/setups/hades/mc-correction-auau-123-wall.yml b/setups/hades/mc-correction-auau-123-wall.yml index 0ca633ea..4083ef82 100644 --- a/setups/hades/mc-correction-auau-123-wall.yml +++ b/setups/hades/mc-correction-auau-123-wall.yml @@ -60,14 +60,14 @@ _cuts: mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} - &w1_cuts - forward_wall_hits/ring: { range: [1.0, 5.0] } - forward_wall_hits/signal: { range: [80.0, 999.0] } + reconstructed_forward_wall_hits/ring: { range: [1.0, 5.0] } + reconstructed_forward_wall_hits/signal: { range: [80.0, 999.0] } - &w2_cuts - forward_wall_hits/ring: { range: [6.0, 7.0] } - forward_wall_hits/signal: { range: [85.0, 999.0] } + reconstructed_forward_wall_hits/ring: { range: [6.0, 7.0] } + reconstructed_forward_wall_hits/signal: { range: [85.0, 999.0] } - &w3_cuts - forward_wall_hits/ring: { range: [8.0, 10.0] } - forward_wall_hits/signal: { range: [88.0, 999.0] } + reconstructed_forward_wall_hits/ring: { range: [8.0, 10.0] } + reconstructed_forward_wall_hits/signal: { range: [88.0, 999.0] } hades_analysis: event-variables: @@ -197,36 +197,36 @@ hades_analysis: ########################################################################### - name: W1 type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal + phi: reconstructed_forward_wall_hits/phi + weight: reconstructed_forward_wall_hits/signal norm: m corrections: - recentering cuts-w1: *w1_cuts qa: - - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} ########################################################################### - name: W2 type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal + phi: reconstructed_forward_wall_hits/phi + weight: reconstructed_forward_wall_hits/signal norm: m corrections: - recentering cuts-w2: *w2_cuts qa: - - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} ########################################################################### - name: W3 type: track - phi: forward_wall_hits/phi - weight: forward_wall_hits/signal + phi: reconstructed_forward_wall_hits/phi + weight: reconstructed_forward_wall_hits/signal norm: m corrections: - recentering cuts-w3: *w3_cuts qa: - - {name: forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} + - {name: reconstructed_forward_wall_hits/phi, nb: 100, lo: -4., hi: 4.} ########################################################################### - name: psi_rp type: psi From 5fe70e3ed4f4b40a2d2d6572a1f9e3ff00de68c9 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 3 Feb 2022 18:44:50 +0100 Subject: [PATCH 268/274] Fix --- setups/hades/mc-correlation-auau-123-wall.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correlation-auau-123-wall.yml b/setups/hades/mc-correlation-auau-123-wall.yml index c72c4fad..e2319b38 100644 --- a/setups/hades/mc-correlation-auau-123-wall.yml +++ b/setups/hades/mc-correlation-auau-123-wall.yml @@ -57,7 +57,7 @@ _tasks_args: query: { tags: { any-in: [ qn_vector ] } } query-list: *detectors components: *sp_components - correction-steps: [ recentered ] + correction-steps: [ plain ] weight: ones - &ta_psi query: { tags: { any-in: [ psi_vector ] } } From 0c1dd5a61a78f63b2fcc03a4070386f0d5b33225 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 4 Feb 2022 10:29:11 +0100 Subject: [PATCH 269/274] Fix --- setups/hades/mc-correlation-auau-123-wall.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setups/hades/mc-correlation-auau-123-wall.yml b/setups/hades/mc-correlation-auau-123-wall.yml index e2319b38..f5b4c2da 100644 --- a/setups/hades/mc-correlation-auau-123-wall.yml +++ b/setups/hades/mc-correlation-auau-123-wall.yml @@ -90,10 +90,10 @@ _tasks: - args: [*ta_qn, *ta_qn] n-samples: 100 weights-type: reference - folder: "/Q1Q1/" + folder: "/Q1Q1" axes: [ *centrality ] - args: [*ta_qn, *ta_psi] n-samples: 100 weights-type: reference - folder: "/Q1Q1/" + folder: "/Q1Q1" axes: [ *centrality ] \ No newline at end of file From 4a4e2888ba2e98e46d2a8a8f88ca3a5cc22c37c9 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 4 Feb 2022 13:53:01 +0100 Subject: [PATCH 270/274] optimization of all particle species + range including 0 --- .../hades/correction-auau-123-occupancy.yml | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index a1218e7e..ffe0d3e4 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -15,8 +15,8 @@ _axes: - &axis_protons_c_eff name: mdc_vtx_tracks_extra/c_eff nb: 10 - lo: 0.005 - hi: 0.007 + lo: -0.0005 + hi: 0.0095 ############ # Pions axes ############ @@ -30,9 +30,9 @@ _axes: hi: 1.05 - &axis_pions_c_eff name: mdc_vtx_tracks_extra/c_eff - nb: 5 - lo: 0.02 - hi: 0.07 + nb: 10 + lo: -0.005 + hi: 0.095 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } @@ -69,6 +69,34 @@ hades_analysis: axes: - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } q-vectors: + ############################################################# + - name: protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/occ_weight + norm: m + axes: + - *axis_protons_pT + - *axis_protons_rapidity + - *axis_protons_c_eff + cuts-quality: *good_particle_cuts + cuts-pid: *protons_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + ############################################################# + - name: pi_neg + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/occ_weight + norm: m + axes: + - *axis_pions_pT + - *axis_pions_rapidity + - *axis_pions_c_eff + cuts-quality: *good_particle_cuts + cuts-pid: *pi_neg_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} ############################################################# - name: pi_pos type: track From d0f7b2ecba704c30f4612461d3df7ee95b6d25e0 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 4 Feb 2022 14:09:08 +0100 Subject: [PATCH 271/274] All three particles are in config --- setups/hades/correlation-auau-123-occupancy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setups/hades/correlation-auau-123-occupancy.yml b/setups/hades/correlation-auau-123-occupancy.yml index 613f9c48..862cf1a7 100644 --- a/setups/hades/correlation-auau-123-occupancy.yml +++ b/setups/hades/correlation-auau-123-occupancy.yml @@ -1,4 +1,8 @@ _detectors: &detectors + - name: protons + tags: [ un_vector ] + - name: pi_neg + tags: [ un_vector ] - name: pi_pos tags: [ un_vector ] - name: W1 From f2811c54c2f81feae630b93de7c339969aa48eb0 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Fri, 11 Feb 2022 14:37:06 +0100 Subject: [PATCH 272/274] Thinner binning --- setups/hades/correction-auau-123-occupancy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setups/hades/correction-auau-123-occupancy.yml b/setups/hades/correction-auau-123-occupancy.yml index ffe0d3e4..3c97871d 100644 --- a/setups/hades/correction-auau-123-occupancy.yml +++ b/setups/hades/correction-auau-123-occupancy.yml @@ -15,8 +15,8 @@ _axes: - &axis_protons_c_eff name: mdc_vtx_tracks_extra/c_eff nb: 10 - lo: -0.0005 - hi: 0.0095 + lo: -0.00025 + hi: 0.00475 ############ # Pions axes ############ @@ -31,8 +31,8 @@ _axes: - &axis_pions_c_eff name: mdc_vtx_tracks_extra/c_eff nb: 10 - lo: -0.005 - hi: 0.095 + lo: -0.0175 + hi: 0.0475 _cuts: - &protons_cuts mdc_vtx_tracks_extra/pid: { equals: 2212 } From 074b0355d3310e70bde9dabf32c67c127305035d Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Thu, 17 Feb 2022 20:44:57 +0100 Subject: [PATCH 273/274] Weighting protons with efficiency --- setups/hades/mc-correction-auau-123-occupancy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setups/hades/mc-correction-auau-123-occupancy.yml b/setups/hades/mc-correction-auau-123-occupancy.yml index 40ccc8c1..239fcd00 100644 --- a/setups/hades/mc-correction-auau-123-occupancy.yml +++ b/setups/hades/mc-correction-auau-123-occupancy.yml @@ -115,7 +115,7 @@ hades_analysis: - name: rec_protons type: track phi: mdc_vtx_tracks_extra/phi - weight: mdc_vtx_tracks_extra/occ_weight + weight: mdc_vtx_tracks_extra/efficiency norm: m axes: - *axis_rec_protons_pT From ef1640e017d0c5468ffba50b709a903b10fcade7 Mon Sep 17 00:00:00 2001 From: mam-mih-val Date: Sat, 19 Feb 2022 20:35:34 +0100 Subject: [PATCH 274/274] all three axes --- .../mc-correction-auau-123-y-pT-theta.yml | 137 ++++++++++++++++++ .../mc-correlation-auau-123-y-pT-theta.yml | 67 +++++++++ 2 files changed, 204 insertions(+) create mode 100644 setups/hades/mc-correction-auau-123-y-pT-theta.yml create mode 100644 setups/hades/mc-correlation-auau-123-y-pT-theta.yml diff --git a/setups/hades/mc-correction-auau-123-y-pT-theta.yml b/setups/hades/mc-correction-auau-123-y-pT-theta.yml new file mode 100644 index 00000000..2cddb692 --- /dev/null +++ b/setups/hades/mc-correction-auau-123-y-pT-theta.yml @@ -0,0 +1,137 @@ +_layouts: + +_axes: + - &axis_rec_protons_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_rec_pions_pT + name: mdc_vtx_tracks_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_tru_protons_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.3, 0.35, 0.45, 0.5, 0.55, 0.6, 0.7, 0.8, 0.95, 1.5] + - &axis_tru_pions_pT + name: sim_particles_extra/pT + bin-edges: [0, 0.08, 0.10, 0.13, 0.15, 0.18, 0.21, 0.25, 0.32, 0.55, 1.0] + - &axis_rec_protons_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_rec_pions_rapidity + name: mdc_vtx_tracks_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_tru_protons_rapidity + name: sim_particles_extra/ycm + nb: 15 + lo: -0.75 + hi: 0.75 + - &axis_tru_pions_rapidity + name: sim_particles_extra/ycm + nb: 17 + lo: -0.65 + hi: 1.05 + - &axis_rec_theta + name: mdc_vtx_tracks_extra/theta + nb: 14 + lo: 0.2 + hi: 1.6 + - &axis_tru_theta + name: sim_particles_extra/theta + nb: 14 + lo: 0.2 + hi: 1.6 + - &axis_rec_uniform_pT + name: mdc_vtx_tracks_extra/pT + nb: 15 + lo: 0.0 + hi: 1.5 + - &axis_tru_uniform_pT + name: sim_particles_extra/pT + nb: 15 + lo: 0.0 + hi: 1.5 + +_cuts: + - &pid_protons_cut + mdc_vtx_tracks_extra/pid: { equals: 2212 } + - &pid_pi_pos_cut + mdc_vtx_tracks_extra/pid: { equals: 211 } + - &pid_pi_neg_cut + mdc_vtx_tracks_extra/pid: { equals: -211 } + - &mf_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [1.09, 1.29]} + - &mb_cuts + mdc_vtx_tracks_extra/pT: {range: [0.0, 2.0]} + mdc_vtx_tracks_extra/rapidity: {range: [0.19, 0.39]} + - &gen_prim_protons_cut + sim_particles_extra/pid: { equals: 2212 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_pos_cut + sim_particles_extra/pid: { equals: 211 } + sim_particles_extra/is_primary: { equals: 1 } + - &gen_prim_pi_neg_cut + sim_particles_extra/pid: { equals: -211 } + sim_particles_extra/is_primary: { equals: 1 } + - &good_track_cuts + mdc_vtx_tracks_extra/dca_xy: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/dca_z: {range: [-10.0, 10.0]} + mdc_vtx_tracks_extra/chi2: {range: [0.0, 100.0]} + - &w1_cuts + forward_wall_hits/ring: { range: [1.0, 5.0] } + forward_wall_hits/signal: { range: [80.0, 999.0] } + - &w2_cuts + forward_wall_hits/ring: { range: [6.0, 7.0] } + forward_wall_hits/signal: { range: [85.0, 999.0] } + - &w3_cuts + forward_wall_hits/ring: { range: [8.0, 10.0] } + forward_wall_hits/signal: { range: [88.0, 999.0] } + +hades_analysis: + event-variables: + - event_header/selected_tof_rpc_hits_centrality + axes: + - { name: event_header/selected_tof_rpc_hits_centrality, nb: 8, lo: 0.0, hi: 40 } + q-vectors: + ########################################################################### + - name: rec_protons + type: track + phi: mdc_vtx_tracks_extra/phi + weight: mdc_vtx_tracks_extra/efficiency + norm: m + axes: + - *axis_rec_uniform_pT + - *axis_rec_protons_rapidity + - *axis_rec_theta + cuts-pid: *pid_protons_cut + cuts-quality: *good_track_cuts + qa: + - {name: mdc_vtx_tracks_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_rec_protons_pT + - *axis_rec_protons_rapidity + - [*axis_rec_protons_rapidity, *axis_rec_protons_pT] + ########################################################################### + - name: tru_protons + type: track + phi: sim_particles_extra/phi + weight: Ones + norm: m + axes: + - *axis_tru_uniform_pT + - *axis_tru_protons_rapidity + - *axis_tru_theta + cuts-pid: *gen_prim_protons_cut + qa: + - {name: sim_particles_extra/phi, nb: 100, lo: -4., hi: 4.} + - *axis_tru_protons_pT + - *axis_tru_protons_rapidity + - [*axis_tru_protons_rapidity, *axis_tru_protons_pT] + ########################################################################### + - name: psi_rp + type: psi + phi: sim_header/reaction_plane + weight: Ones + norm: mag \ No newline at end of file diff --git a/setups/hades/mc-correlation-auau-123-y-pT-theta.yml b/setups/hades/mc-correlation-auau-123-y-pT-theta.yml new file mode 100644 index 00000000..c0ad1ed4 --- /dev/null +++ b/setups/hades/mc-correlation-auau-123-y-pT-theta.yml @@ -0,0 +1,67 @@ +_detectors: &detectors + - name: rec_protons + tags: [ rec_vector ] + - name: tru_protons + tags: [ tru_vector ] + - name: psi_rp + tags: [ psi_vector ] + +_axes: + - ¢rality + name: event_header_selected_tof_rpc_hits_centrality + nb: 8 + lo: 0 + hi: 40 + +_components: + - &sp_components [ x1,y1 ] + - &sp2_components [ x2,y2 ] + +_tasks_args: + - &ta_rec + query: { tags: { any-in: [ rec_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: sumw + - &ta_rec2 + query: { tags: { any-in: [ rec_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: sumw + - &ta_tru + query: { tags: { any-in: [ tru_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + - &ta_tru2 + query: { tags: { any-in: [ tru_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: sumw + - &ta_psi + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp_components + correction-steps: [ plain ] + weight: ones + - &ta_psi2 + query: { tags: { any-in: [ psi_vector ] } } + query-list: *detectors + components: *sp2_components + correction-steps: [ plain ] + weight: ones + +_tasks: + - args: [*ta_rec, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/u1Q1/rec" + axes: [ *centrality ] + - args: [*ta_tru, *ta_psi] + n-samples: 100 + weights-type: observable + folder: "/u1Q1/tru" + axes: [ *centrality ] \ No newline at end of file