From d43063525101ec5dcbaa04dc62b16372211d35b8 Mon Sep 17 00:00:00 2001 From: Evgeny Kryshen Date: Wed, 13 Jul 2022 17:20:46 +0300 Subject: [PATCH] CCDB update for event selection in Run1 converted data --- Common/CCDB/EventSelectionParams.cxx | 140 +++++++++++------- Common/CCDB/EventSelectionParams.h | 5 +- Common/CCDB/TriggerAliases.cxx | 2 + Common/CCDB/TriggerAliases.h | 4 +- .../macros/upload_event_selection_params.C | 44 +++++- Common/CCDB/macros/upload_trigger_aliases.C | 16 +- 6 files changed, 146 insertions(+), 65 deletions(-) diff --git a/Common/CCDB/EventSelectionParams.cxx b/Common/CCDB/EventSelectionParams.cxx index 0a955908ad5..2a1f62c49ce 100644 --- a/Common/CCDB/EventSelectionParams.cxx +++ b/Common/CCDB/EventSelectionParams.cxx @@ -45,76 +45,108 @@ const char* selectionLabels[kNsel] = { "kNoInconsistentVtx", "kNoPileupInMultBins", "kNoPilupMV", - "kNoPileupTPC"}; + "kNoPileupTPC" + "kIsTriggerTVX", + "kIsINT1"}; } -EventSelectionParams::EventSelectionParams(int system) +EventSelectionParams::EventSelectionParams(int system, int run) { memset(selectionBarrel, 0, sizeof(selectionBarrel)); memset(selectionMuonWithPileupCuts, 0, sizeof(selectionMuonWithPileupCuts)); memset(selectionMuonWithoutPileupCuts, 0, sizeof(selectionMuonWithoutPileupCuts)); - if (system == 0 || system == 1 || system == 2) { // pp, pA or Ap - // default barrel selection + if (run == 1) { selectionBarrel[kIsBBV0A] = 1; selectionBarrel[kIsBBV0C] = 1; - selectionBarrel[kNoV0MOnVsOfPileup] = 1; - selectionBarrel[kNoSPDOnVsOfPileup] = 1; - selectionBarrel[kNoV0Casymmetry] = 1; - selectionBarrel[kIsGoodTimeRange] = 1; - selectionBarrel[kNoIncompleteDAQ] = 1; - selectionBarrel[kNoTPCHVdip] = 1; - selectionBarrel[kNoPileupFromSPD] = 1; - selectionBarrel[kNoV0PFPileup] = 1; - selectionBarrel[kNoSPDClsVsTklBG] = 1; - selectionBarrel[kNoV0C012vsTklBG] = 1; - - // similar to Barrel but without kNoTPCHVdip and kIsGoodTimeRange checks - selectionMuonWithPileupCuts[kIsBBV0A] = 1; - selectionMuonWithPileupCuts[kIsBBV0C] = 1; - selectionMuonWithPileupCuts[kNoV0MOnVsOfPileup] = 1; - selectionMuonWithPileupCuts[kNoSPDOnVsOfPileup] = 1; - selectionMuonWithPileupCuts[kNoV0Casymmetry] = 1; - selectionMuonWithPileupCuts[kNoIncompleteDAQ] = 1; - selectionMuonWithPileupCuts[kNoPileupFromSPD] = 1; - selectionMuonWithPileupCuts[kNoV0PFPileup] = 1; - selectionMuonWithPileupCuts[kNoSPDClsVsTklBG] = 1; - selectionMuonWithPileupCuts[kNoV0C012vsTklBG] = 1; - - // basic checks for muon analyses without in/out-of-bunch pileup rejection - selectionMuonWithoutPileupCuts[kIsBBV0A] = 1; - selectionMuonWithoutPileupCuts[kIsBBV0C] = 1; - selectionMuonWithoutPileupCuts[kNoV0Casymmetry] = 1; - selectionMuonWithoutPileupCuts[kNoIncompleteDAQ] = 1; - selectionMuonWithoutPileupCuts[kNoV0C012vsTklBG] = 1; - } - - if (system == 1) { // additional ZDC checks in pA - selectionBarrel[kNoBGZNA] = 1; - selectionMuonWithPileupCuts[kNoBGZNA] = 1; - selectionBarrel[kNoBGZNA] = 1; - } - - if (system == 2) { // additional ZDC checks in Ap - selectionBarrel[kNoBGZNC] = 1; - selectionMuonWithPileupCuts[kNoBGZNC] = 1; - selectionBarrel[kNoBGZNC] = 1; - } - - if (system == 3) { // AA - selectionBarrel[kIsBBV0A] = 1; - selectionBarrel[kIsBBV0C] = 1; - selectionBarrel[kIsBBZAC] = 1; - selectionBarrel[kIsGoodTimeRange] = 1; selectionBarrel[kNoTPCHVdip] = 1; + selectionBarrel[kNoIncompleteDAQ] = 1; + selectionBarrel[kNoTPCLaserWarmUp] = 1; selectionMuonWithPileupCuts[kIsBBV0A] = 1; selectionMuonWithPileupCuts[kIsBBV0C] = 1; - selectionMuonWithPileupCuts[kIsBBZAC] = 1; selectionMuonWithoutPileupCuts[kIsBBV0A] = 1; selectionMuonWithoutPileupCuts[kIsBBV0C] = 1; - selectionMuonWithoutPileupCuts[kIsBBZAC] = 1; + + if (system == 1) { // additional ZDC checks in pA + selectionBarrel[kNoBGZNA] = 1; + selectionMuonWithPileupCuts[kNoBGZNA] = 1; + selectionMuonWithoutPileupCuts[kNoBGZNA] = 1; + } + if (system == 2) { // additional ZDC checks in Ap + selectionBarrel[kNoBGZNC] = 1; + selectionMuonWithPileupCuts[kNoBGZNC] = 1; + selectionMuonWithoutPileupCuts[kNoBGZNC] = 1; + } + if (system == 3) { // AA + selectionBarrel[kIsBBZAC] = 1; + selectionMuonWithPileupCuts[kIsBBZAC] = 1; + selectionMuonWithoutPileupCuts[kIsBBZAC] = 1; + } + } else if (run == 2) { + if (system == 0 || system == 1 || system == 2) { // pp, pA or Ap + // default barrel selection + selectionBarrel[kIsBBV0A] = 1; + selectionBarrel[kIsBBV0C] = 1; + selectionBarrel[kNoV0MOnVsOfPileup] = 1; + selectionBarrel[kNoSPDOnVsOfPileup] = 1; + selectionBarrel[kNoV0Casymmetry] = 1; + selectionBarrel[kIsGoodTimeRange] = 1; + selectionBarrel[kNoIncompleteDAQ] = 1; + selectionBarrel[kNoTPCHVdip] = 1; + selectionBarrel[kNoPileupFromSPD] = 1; + selectionBarrel[kNoV0PFPileup] = 1; + selectionBarrel[kNoSPDClsVsTklBG] = 1; + selectionBarrel[kNoV0C012vsTklBG] = 1; + + // similar to Barrel but without kNoTPCHVdip and kIsGoodTimeRange checks + selectionMuonWithPileupCuts[kIsBBV0A] = 1; + selectionMuonWithPileupCuts[kIsBBV0C] = 1; + selectionMuonWithPileupCuts[kNoV0MOnVsOfPileup] = 1; + selectionMuonWithPileupCuts[kNoSPDOnVsOfPileup] = 1; + selectionMuonWithPileupCuts[kNoV0Casymmetry] = 1; + selectionMuonWithPileupCuts[kNoIncompleteDAQ] = 1; + selectionMuonWithPileupCuts[kNoPileupFromSPD] = 1; + selectionMuonWithPileupCuts[kNoV0PFPileup] = 1; + selectionMuonWithPileupCuts[kNoSPDClsVsTklBG] = 1; + selectionMuonWithPileupCuts[kNoV0C012vsTklBG] = 1; + + // basic checks for muon analyses without in/out-of-bunch pileup rejection + selectionMuonWithoutPileupCuts[kIsBBV0A] = 1; + selectionMuonWithoutPileupCuts[kIsBBV0C] = 1; + selectionMuonWithoutPileupCuts[kNoV0Casymmetry] = 1; + selectionMuonWithoutPileupCuts[kNoIncompleteDAQ] = 1; + selectionMuonWithoutPileupCuts[kNoV0C012vsTklBG] = 1; + } + + if (system == 1) { // additional ZDC checks in pA + selectionBarrel[kNoBGZNA] = 1; + selectionMuonWithPileupCuts[kNoBGZNA] = 1; + selectionMuonWithoutPileupCuts[kNoBGZNA] = 1; + } + + if (system == 2) { // additional ZDC checks in Ap + selectionBarrel[kNoBGZNC] = 1; + selectionMuonWithPileupCuts[kNoBGZNC] = 1; + selectionMuonWithoutPileupCuts[kNoBGZNC] = 1; + } + + if (system == 3) { // AA + selectionBarrel[kIsBBV0A] = 1; + selectionBarrel[kIsBBV0C] = 1; + selectionBarrel[kIsBBZAC] = 1; + selectionBarrel[kIsGoodTimeRange] = 1; + selectionBarrel[kNoTPCHVdip] = 1; + + selectionMuonWithPileupCuts[kIsBBV0A] = 1; + selectionMuonWithPileupCuts[kIsBBV0C] = 1; + selectionMuonWithPileupCuts[kIsBBZAC] = 1; + + selectionMuonWithoutPileupCuts[kIsBBV0A] = 1; + selectionMuonWithoutPileupCuts[kIsBBV0C] = 1; + selectionMuonWithoutPileupCuts[kIsBBZAC] = 1; + } } } diff --git a/Common/CCDB/EventSelectionParams.h b/Common/CCDB/EventSelectionParams.h index c8419ed2a1a..5ec59afd2e8 100644 --- a/Common/CCDB/EventSelectionParams.h +++ b/Common/CCDB/EventSelectionParams.h @@ -52,6 +52,7 @@ enum EventSelectionFlags { kNoPileupMV, // no pileup according to multi-vertexer kNoPileupTPC, // no pileup in TPC kIsTriggerTVX, // FT0 vertex (acceptable FT0C-FT0A time difference) at trigger level + kIsINT1, // SPDGFO >= 1 || V0A || V0C kNsel // counter }; @@ -64,7 +65,7 @@ using namespace evsel; class EventSelectionParams { public: - EventSelectionParams(int system = 0); + EventSelectionParams(int system = 0, int run = 2); void DisableOutOfBunchPileupCuts(); void SetOnVsOfParams(float newV0MOnVsOfA, float newV0MOnVsOfB, float newSPDOnVsOfA, float newSPDOnVsOfB); bool* GetSelection(int iSelection); @@ -134,7 +135,7 @@ class EventSelectionParams float fV0CasymA = -25.f; float fV0CasymB = 0.15f; - ClassDefNV(EventSelectionParams, 2) + ClassDefNV(EventSelectionParams, 3) }; #endif diff --git a/Common/CCDB/TriggerAliases.cxx b/Common/CCDB/TriggerAliases.cxx index a6c4c4f47fc..a7e5e82d7b1 100644 --- a/Common/CCDB/TriggerAliases.cxx +++ b/Common/CCDB/TriggerAliases.cxx @@ -24,6 +24,8 @@ const char* aliasLabels[kNaliases] = { "kCUP9", "kMUP10", "kMUP11", + "kINT1", + "kUnbiased", "kALL"}; void TriggerAliases::AddClassIdToAlias(uint32_t aliasId, int classId) diff --git a/Common/CCDB/TriggerAliases.h b/Common/CCDB/TriggerAliases.h index c1e0cf8bec1..5f5c1ab81f9 100644 --- a/Common/CCDB/TriggerAliases.h +++ b/Common/CCDB/TriggerAliases.h @@ -29,6 +29,8 @@ enum triggerAliases { kCUP9, kMUP10, kMUP11, + kINT1, + kUnbiased, kALL, kNaliases }; @@ -52,7 +54,7 @@ class TriggerAliases std::map mAliasToClassNames; std::map mAliasToTriggerMask; std::map mAliasToTriggerMaskNext50; - ClassDefNV(TriggerAliases, 3) + ClassDefNV(TriggerAliases, 4) }; #endif diff --git a/Common/CCDB/macros/upload_event_selection_params.C b/Common/CCDB/macros/upload_event_selection_params.C index 405f5bdd646..f959f196864 100644 --- a/Common/CCDB/macros/upload_event_selection_params.C +++ b/Common/CCDB/macros/upload_event_selection_params.C @@ -33,6 +33,48 @@ void upload_event_selection_params() bool isNew[nPeriodsMax] = {0}; int n = 0; + period[n] = "pp2010"; + par[n] = new EventSelectionParams(0, 1); + runFirst[n] = 114786; + runLast[n] = 136377; + + n++; + period[n] = "PbPb_10h"; + par[n] = new EventSelectionParams(3, 1); + runFirst[n] = 137135; + runLast[n] = 139517; + + n++; + period[n] = "pp2011"; + par[n] = new EventSelectionParams(0, 1); + runFirst[n] = 144871; + runLast[n] = 159582; + + n++; + period[n] = "PbPb_11h"; + par[n] = new EventSelectionParams(3, 1); + runFirst[n] = 167915; + runLast[n] = 170593; + + n++; + period[n] = "pp2012"; + par[n] = new EventSelectionParams(0, 2); + runFirst[n] = 176661; + runLast[n] = 193752; + + n++; + period[n] = "pPb2013"; + par[n] = new EventSelectionParams(1, 1); + runFirst[n] = 195344; + runLast[n] = 196310; + + n++; + period[n] = "Pbp2013"; + par[n] = new EventSelectionParams(2, 1); + runFirst[n] = 196433; + runLast[n] = 197388; + + n++; period[n] = "defaultRun2"; par[n] = new EventSelectionParams(0); runFirst[n] = 209122; @@ -213,7 +255,7 @@ void upload_event_selection_params() ccdb.storeAsTFileAny(par[i], "EventSelection/EventSelectionParams", metadata, sor, eor); } - if (1) { // Default Run 3 object + if (0) { // Default Run 3 object ULong64_t sorRun3 = 1543767116001; ULong64_t eorRun3 = 1893445200000; metadata["period"] = "Default Run 3"; diff --git a/Common/CCDB/macros/upload_trigger_aliases.C b/Common/CCDB/macros/upload_trigger_aliases.C index ddaa3eeba15..1203e7e1c22 100644 --- a/Common/CCDB/macros/upload_trigger_aliases.C +++ b/Common/CCDB/macros/upload_trigger_aliases.C @@ -23,17 +23,19 @@ using std::string; void createDefaultAliases(map& mAliases) { - mAliases[kINT7] = "CINT7-B-NOPF-CENT,CV0L7-B-NOPF-CENT,CINT7-B-NOPF-CENTNOTRD,CINT7ZAC-B-NOPF-CENTNOPMD"; - mAliases[kEMC7] = "CEMC7-B-NOPF-CENTNOPMD,CDMC7-B-NOPF-CENTNOPMD"; + mAliases[kINT7] = "CINT7-B-NOPF-CENT,CINT7-B-NOPF-FAST,CV0L7-B-NOPF-CENT,CINT7-B-NOPF-CENTNOTRD,CINT7ZAC-B-NOPF-CENTNOPMD,CINT7-B-NOPF-ALLNOTRD,CINT7-I-NOPF-ALLNOTRD,CINT7-S-NOPF-ALLNOTRD,CMBAC-B-NOPF-ALL,CMBACS2-B-NOPF-ALLNOTRD,CMBACS2-B-NOPF-ALL"; + mAliases[kEMC7] = "CEMC7-B-NOPF-CENTNOPMD,CDMC7-B-NOPF-CENTNOPMD,CEMC7-B-NOPF-CENTNOTRD,CDMC7-B-NOPF-CENTNOTRD"; mAliases[kINT7inMUON] = "CINT7-B-NOPF-MUFAST"; - mAliases[kMuonSingleLowPt7] = "CMSL7-B-NOPF-MUFAST"; - mAliases[kMuonUnlikeLowPt7] = "CMUL7-B-NOPF-MUFAST"; - mAliases[kMuonLikeLowPt7] = "CMLL7-B-NOPF-MUFAST"; - mAliases[kMuonSingleHighPt7] = "CMSH7-B-NOPF-MUFAST"; + mAliases[kMuonSingleLowPt7] = "CMSL7-B-NOPF-MUFAST,CMSL7-B-NOPF-MUON,CMSL7-S-NOPF-MUON,CMSL7-SC-NOPF-MUON,CPBI1MSL-B-NOPF-MUON,CMUS7-B-NOPF-MUON"; + mAliases[kMuonUnlikeLowPt7] = "CMUL7-B-NOPF-MUFAST,CMUL7-B-NOPF-MUON,CMUL7-S-NOPF-MUON,CMUL7-S-NOPF-ALLNOTRD,CPBI1MUL-B-NOPF-MUON,CMUU7-B-NOPF-MUON,CMUU7-B-NOPF-ALLNOTRD"; + mAliases[kMuonLikeLowPt7] = "CMLL7-B-NOPF-MUFAST,CMLL7-B-NOPF-MUON,CMLL7-S-NOPF-MUON,CPBI1MLL-B-NOPF-MUON"; + mAliases[kMuonSingleHighPt7] = "CMSH7-B-NOPF-MUFAST,CMSH7-B-NOPF-MUON,CMSH7-S-NOPF-MUON,CMSH7-S-NOPF-ALLNOTRD,CPBI1MSH-B-NOPF-MUON,CMUSH7-B-NOPF-MUON"; mAliases[kCUP8] = "CCUP8-B-NOPF-CENTNOTRD"; mAliases[kCUP9] = "CCUP9-B-NOPF-CENTNOTRD"; mAliases[kMUP10] = "CMUP10-B-NOPF-MUFAST"; mAliases[kMUP11] = "CMUP11-B-NOPF-MUFAST"; + mAliases[kINT1] = "CINT1B-ABCE-NOPF-ALL,CINT1-B-NOPF-ALLNOTRD,CINT1-B-NOPF-ALLNOTRD"; + mAliases[kUnbiased] = "CBEAMB-ABCE-NOPF-ALL,CBEAMB-B-NOPF-ALLNOTRD,CTRUE-B-NOPF-ALLNOTRD,CTRUE-S-NOPF-ALLNOTRD,CTRUE-B-NOPF-CENTNOTRD"; } void upload_trigger_aliases() @@ -54,7 +56,7 @@ void upload_trigger_aliases() map metadata, metadataRCT, header; // read list of runs from text file - std::ifstream f("runs.txt"); + std::ifstream f("runs_run1.txt"); std::vector runs; int r = 0; while (f >> r) {