diff --git a/PWGJE/DataModel/JetReducedData.h b/PWGJE/DataModel/JetReducedData.h index fcc3d581862..3ed7201f04a 100644 --- a/PWGJE/DataModel/JetReducedData.h +++ b/PWGJE/DataModel/JetReducedData.h @@ -98,8 +98,14 @@ DECLARE_SOA_COLUMN(FullTriggerSel, fullTriggerSel, uint32_t); DECLARE_SOA_COLUMN(ChargedHFTriggerSel, chargedHFTriggerSel, uint8_t); DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector); DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector); +DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSel8, readCountsWithTVXAndSel8, std::vector); +DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV, readCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV, std::vector); +DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSel8Full, readCountsWithTVXAndSel8Full, std::vector); +DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV, readCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV, std::vector); DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8, readCountsWithTVXAndZVertexAndSel8, std::vector); +DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV, readCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV, std::vector); DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8Full, readCountsWithTVXAndZVertexAndSel8Full, std::vector); +DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV, readCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV, std::vector); DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel8FullPbPb, readCountsWithTVXAndZVertexAndSel8FullPbPb, std::vector); DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelMC, readCountsWithTVXAndZVertexAndSelMC, std::vector); DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSelMCFull, readCountsWithTVXAndZVertexAndSelMCFull, std::vector); @@ -171,8 +177,14 @@ DECLARE_SOA_TABLE(JChHFTrigSels, "AOD", "JCHHFTRIGSEL", DECLARE_SOA_TABLE_STAGED(CollisionCounts, "COLLCOUNT", jcollision::ReadCounts, jcollision::ReadCountsWithTVX, + jcollision::ReadCountsWithTVXAndSel8, + jcollision::ReadCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV, + jcollision::ReadCountsWithTVXAndSel8Full, + jcollision::ReadCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV, jcollision::ReadCountsWithTVXAndZVertexAndSel8, + jcollision::ReadCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV, jcollision::ReadCountsWithTVXAndZVertexAndSel8Full, + jcollision::ReadCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV, jcollision::ReadCountsWithTVXAndZVertexAndSel8FullPbPb, jcollision::ReadCountsWithTVXAndZVertexAndSelMC, jcollision::ReadCountsWithTVXAndZVertexAndSelMCFull, diff --git a/PWGJE/TableProducer/luminosityCalculator.cxx b/PWGJE/TableProducer/luminosityCalculator.cxx index 8767ae604e2..ae0c025396f 100644 --- a/PWGJE/TableProducer/luminosityCalculator.cxx +++ b/PWGJE/TableProducer/luminosityCalculator.cxx @@ -40,7 +40,7 @@ struct LuminosityCalculator { void init(InitContext&) { - std::vector histLabels = {"BC", "BC+TVX", "BC+TVX+NoTFB", "BC+TVX+NoTFB+NoITSROFB", "Coll", "Coll+TVX", "Coll+TVX+VtxZ+Sel8", "Coll+TVX+VtxZ+Sel8Full", "Coll+TVX+VtxZ+Sel8FullPbPb", "Coll+TVX+VtxZ+SelMC", "Coll+TVX+VtxZ+SelMCFull", "Coll+TVX+VtxZ+SelMCFullPbPb", "Coll+TVX+VtxZ+SelUnanchoredMC", "Coll+TVX+VtxZ+SelTVX", "Coll+TVX+VtxZ+Sel7", "Coll+TVX+VtxZ+Sel7KINT7", "custom"}; + std::vector histLabels = {"BC", "BC+TVX", "BC+TVX+NoTFB", "BC+TVX+NoTFB+NoITSROFB", "Coll", "Coll+TVX", "Coll+TVX+Sel8", "Coll+TVX+Sel8+IsGoodZvtx", "Coll+TVX+Sel8Full", "Coll+TVX+Sel8Full+IsGoodZvtx", "Coll+TVX+VtxZ+Sel8", "Coll+TVX+VtxZ+Sel8+IsGoodZvtx", "Coll+TVX+VtxZ+Sel8Full", "Coll+TVX+VtxZ+Sel8Full+IsGoodZvtx", "Coll+TVX+VtxZ+Sel8FullPbPb", "Coll+TVX+VtxZ+SelMC", "Coll+TVX+VtxZ+SelMCFull", "Coll+TVX+VtxZ+SelMCFullPbPb", "Coll+TVX+VtxZ+SelUnanchoredMC", "Coll+TVX+VtxZ+SelTVX", "Coll+TVX+VtxZ+Sel7", "Coll+TVX+VtxZ+Sel7KINT7", "custom"}; registry.add("counter", "BCs and Collisions", HistType::kTH1D, {{static_cast(histLabels.size()), -0.5, static_cast(histLabels.size()) - 0.5}}); auto counter = registry.get(HIST("counter")); for (std::vector::size_type iCounter = 0; iCounter < histLabels.size(); iCounter++) { @@ -64,8 +64,14 @@ struct LuminosityCalculator { int readCollision = 0; int readCollisionWithTVXCounter = 0; + int readCollisionWithTVXAndSel8Counter = 0; + int readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounter = 0; + int readCollisionWithTVXAndSel8FullCounter = 0; + int readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounter = 0; int readCollisionWithTVXAndZVertexAndSel8Counter = 0; + int readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounter = 0; int readCollisionWithTVXAndZVertexAndSel8FullCounter = 0; + int readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounter = 0; int readCollisionWithTVXAndZVertexAndSel8FullPbPbCounter = 0; int readCollisionWithTVXAndZVertexAndSelMCCounter = 0; int readCollisionWithTVXAndZVertexAndSelMCFullCounter = 0; @@ -79,8 +85,14 @@ struct LuminosityCalculator { for (const auto& collisionCount : collisionCounts) { readCollision += collisionCount.readCounts().front(); readCollisionWithTVXCounter += collisionCount.readCountsWithTVX().front(); + readCollisionWithTVXAndSel8Counter += collisionCount.readCountsWithTVXAndSel8().front(); + readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounter += collisionCount.readCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV().front(); + readCollisionWithTVXAndSel8FullCounter += collisionCount.readCountsWithTVXAndSel8Full().front(); + readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounter += collisionCount.readCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV().front(); readCollisionWithTVXAndZVertexAndSel8Counter += collisionCount.readCountsWithTVXAndZVertexAndSel8().front(); + readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounter += collisionCount.readCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV().front(); readCollisionWithTVXAndZVertexAndSel8FullCounter += collisionCount.readCountsWithTVXAndZVertexAndSel8Full().front(); + readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounter += collisionCount.readCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV().front(); readCollisionWithTVXAndZVertexAndSel8FullPbPbCounter += collisionCount.readCountsWithTVXAndZVertexAndSel8FullPbPb().front(); readCollisionWithTVXAndZVertexAndSelMCCounter += collisionCount.readCountsWithTVXAndZVertexAndSelMC().front(); readCollisionWithTVXAndZVertexAndSelMCFullCounter += collisionCount.readCountsWithTVXAndZVertexAndSelMCFull().front(); @@ -98,17 +110,23 @@ struct LuminosityCalculator { registry.get(HIST("counter"))->SetBinContent(4, registry.get(HIST("counter"))->GetBinContent(4) + readBCWithTVXAndNoTFBAndNoITSROFB); registry.get(HIST("counter"))->SetBinContent(5, registry.get(HIST("counter"))->GetBinContent(5) + readCollision); registry.get(HIST("counter"))->SetBinContent(6, registry.get(HIST("counter"))->GetBinContent(6) + readCollisionWithTVXCounter); - registry.get(HIST("counter"))->SetBinContent(7, registry.get(HIST("counter"))->GetBinContent(7) + readCollisionWithTVXAndZVertexAndSel8Counter); - registry.get(HIST("counter"))->SetBinContent(8, registry.get(HIST("counter"))->GetBinContent(8) + readCollisionWithTVXAndZVertexAndSel8FullCounter); - registry.get(HIST("counter"))->SetBinContent(9, registry.get(HIST("counter"))->GetBinContent(9) + readCollisionWithTVXAndZVertexAndSel8FullPbPbCounter); - registry.get(HIST("counter"))->SetBinContent(10, registry.get(HIST("counter"))->GetBinContent(10) + readCollisionWithTVXAndZVertexAndSelMCCounter); - registry.get(HIST("counter"))->SetBinContent(11, registry.get(HIST("counter"))->GetBinContent(11) + readCollisionWithTVXAndZVertexAndSelMCFullCounter); - registry.get(HIST("counter"))->SetBinContent(12, registry.get(HIST("counter"))->GetBinContent(12) + readCollisionWithTVXAndZVertexAndSelMCFullPbPbCounter); - registry.get(HIST("counter"))->SetBinContent(13, registry.get(HIST("counter"))->GetBinContent(13) + readCollisionWithTVXAndZVertexAndSelUnanchoredMCCounter); - registry.get(HIST("counter"))->SetBinContent(14, registry.get(HIST("counter"))->GetBinContent(14) + readCollisionWithTVXAndZVertexAndSelTVXCounter); - registry.get(HIST("counter"))->SetBinContent(15, registry.get(HIST("counter"))->GetBinContent(15) + readCollisionWithTVXAndZVertexAndSel7Counter); - registry.get(HIST("counter"))->SetBinContent(16, registry.get(HIST("counter"))->GetBinContent(16) + readCollisionWithTVXAndZVertexAndSel7KINT7Counter); - registry.get(HIST("counter"))->SetBinContent(16, registry.get(HIST("counter"))->GetBinContent(17) + readCollisionWithCustomCounter); + registry.get(HIST("counter"))->SetBinContent(7, registry.get(HIST("counter"))->GetBinContent(7) + readCollisionWithTVXAndSel8Counter); + registry.get(HIST("counter"))->SetBinContent(8, registry.get(HIST("counter"))->GetBinContent(8) + readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounter); + registry.get(HIST("counter"))->SetBinContent(9, registry.get(HIST("counter"))->GetBinContent(9) + readCollisionWithTVXAndSel8FullCounter); + registry.get(HIST("counter"))->SetBinContent(10, registry.get(HIST("counter"))->GetBinContent(10) + readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounter); + registry.get(HIST("counter"))->SetBinContent(11, registry.get(HIST("counter"))->GetBinContent(11) + readCollisionWithTVXAndZVertexAndSel8Counter); + registry.get(HIST("counter"))->SetBinContent(12, registry.get(HIST("counter"))->GetBinContent(12) + readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounter); + registry.get(HIST("counter"))->SetBinContent(13, registry.get(HIST("counter"))->GetBinContent(13) + readCollisionWithTVXAndZVertexAndSel8FullCounter); + registry.get(HIST("counter"))->SetBinContent(14, registry.get(HIST("counter"))->GetBinContent(14) + readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounter); + registry.get(HIST("counter"))->SetBinContent(15, registry.get(HIST("counter"))->GetBinContent(15) + readCollisionWithTVXAndZVertexAndSel8FullPbPbCounter); + registry.get(HIST("counter"))->SetBinContent(16, registry.get(HIST("counter"))->GetBinContent(16) + readCollisionWithTVXAndZVertexAndSelMCCounter); + registry.get(HIST("counter"))->SetBinContent(17, registry.get(HIST("counter"))->GetBinContent(17) + readCollisionWithTVXAndZVertexAndSelMCFullCounter); + registry.get(HIST("counter"))->SetBinContent(18, registry.get(HIST("counter"))->GetBinContent(18) + readCollisionWithTVXAndZVertexAndSelMCFullPbPbCounter); + registry.get(HIST("counter"))->SetBinContent(19, registry.get(HIST("counter"))->GetBinContent(19) + readCollisionWithTVXAndZVertexAndSelUnanchoredMCCounter); + registry.get(HIST("counter"))->SetBinContent(20, registry.get(HIST("counter"))->GetBinContent(20) + readCollisionWithTVXAndZVertexAndSelTVXCounter); + registry.get(HIST("counter"))->SetBinContent(21, registry.get(HIST("counter"))->GetBinContent(21) + readCollisionWithTVXAndZVertexAndSel7Counter); + registry.get(HIST("counter"))->SetBinContent(22, registry.get(HIST("counter"))->GetBinContent(22) + readCollisionWithTVXAndZVertexAndSel7KINT7Counter); + registry.get(HIST("counter"))->SetBinContent(23, registry.get(HIST("counter"))->GetBinContent(23) + readCollisionWithCustomCounter); } PROCESS_SWITCH(LuminosityCalculator, processCalculateLuminosity, "calculate ingredients for luminosity and fill a histogram", true); }; diff --git a/PWGJE/TableProducer/luminosityProducer.cxx b/PWGJE/TableProducer/luminosityProducer.cxx index 455ab4e5910..5db657e55b2 100644 --- a/PWGJE/TableProducer/luminosityProducer.cxx +++ b/PWGJE/TableProducer/luminosityProducer.cxx @@ -106,8 +106,14 @@ struct LuminosityProducer { { int readCollisionCounter = 0; int readCollisionWithTVXCounter = 0; + int readCollisionWithTVXAndSel8Counter = 0; // before applying any VtxZ cut - required for the vertex finding efficiency correction + int readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounter = 0; + int readCollisionWithTVXAndSel8FullCounter = 0; // before applying any VtxZ cut - required for the vertex finding efficiency correction + int readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounter = 0; int readCollisionWithTVXAndZVertexAndSel8Counter = 0; + int readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounter = 0; // after applying VtxZ cut - required for the vertex finding efficiency correction int readCollisionWithTVXAndZVertexAndSel8FullCounter = 0; + int readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounter = 0; int readCollisionWithTVXAndZVertexAndSel8FullPbPbCounter = 0; int readCollisionWithTVXAndZVertexAndSelMCCounter = 0; int readCollisionWithTVXAndZVertexAndSelMCFullCounter = 0; @@ -121,12 +127,27 @@ struct LuminosityProducer { readCollisionCounter++; if (jetderiveddatautilities::selectCollision(collision, jetderiveddatautilities::initialiseEventSelectionBits("TVX"))) { // asuumes all selections include the TVX trigger readCollisionWithTVXCounter++; + if (jetderiveddatautilities::selectCollision(collision, jetderiveddatautilities::initialiseEventSelectionBits("sel8"))) { + readCollisionWithTVXAndSel8Counter++; + } + if (jetderiveddatautilities::selectCollision(collision, jetderiveddatautilities::initialiseEventSelectionBits("sel8+IsGoodZvtxFT0vsPV"))) { + readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounter++; + } + if (jetderiveddatautilities::selectCollision(collision, jetderiveddatautilities::initialiseEventSelectionBits("sel8Full"))) { + readCollisionWithTVXAndSel8FullCounter++; + } + if (jetderiveddatautilities::selectCollision(collision, jetderiveddatautilities::initialiseEventSelectionBits("sel8Full+IsGoodZvtxFT0vsPV"))) { + readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounter++; + } if (std::abs(collision.posZ()) > vertexZCutForCounting) { continue; } if (jetderiveddatautilities::selectCollision(collision, jetderiveddatautilities::initialiseEventSelectionBits("sel8"))) { readCollisionWithTVXAndZVertexAndSel8Counter++; } + if (jetderiveddatautilities::selectCollision(collision, jetderiveddatautilities::initialiseEventSelectionBits("sel8+IsGoodZvtxFT0vsPV"))) { + readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounter++; + } if (jetderiveddatautilities::selectCollision(collision, jetderiveddatautilities::initialiseEventSelectionBits("TVX"))) { readCollisionWithTVXAndZVertexAndSelTVXCounter++; } @@ -139,6 +160,9 @@ struct LuminosityProducer { if (jetderiveddatautilities::selectCollision(collision, jetderiveddatautilities::initialiseEventSelectionBits("sel8Full"))) { readCollisionWithTVXAndZVertexAndSel8FullCounter++; } + if (jetderiveddatautilities::selectCollision(collision, jetderiveddatautilities::initialiseEventSelectionBits("sel8Full+IsGoodZvtxFT0vsPV"))) { + readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounter++; + } if (jetderiveddatautilities::selectCollision(collision, jetderiveddatautilities::initialiseEventSelectionBits("sel8FullPbPb"))) { readCollisionWithTVXAndZVertexAndSel8FullPbPbCounter++; } @@ -161,8 +185,14 @@ struct LuminosityProducer { } std::vector previousReadCounts; std::vector previousReadCountsWithTVX; + std::vector previousReadCountsWithTVXAndSel8; + std::vector previousReadCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV; + std::vector previousReadCountsWithTVXAndSel8Full; + std::vector previousReadCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV; std::vector previousReadCountsWithTVXAndZVertexAndSel8; + std::vector previousReadCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV; std::vector previousReadCountsWithTVXAndZVertexAndSel8Full; + std::vector previousReadCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV; std::vector previousReadCountsWithTVXAndZVertexAndSel8FullPbPb; std::vector previousReadCountsWithTVXAndZVertexAndSelMC; std::vector previousReadCountsWithTVXAndZVertexAndSelMCFull; @@ -177,8 +207,14 @@ struct LuminosityProducer { for (const auto& collisionCount : collisionCounts) { auto readCollisionCounterSpan = collisionCount.readCounts(); auto readCollisionWithTVXCounterSpan = collisionCount.readCountsWithTVX(); + auto readCollisionWithTVXAndSel8CounterSpan = collisionCount.readCountsWithTVXAndSel8(); + auto readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounterSpan = collisionCount.readCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV(); + auto readCollisionWithTVXAndSel8FullCounterSpan = collisionCount.readCountsWithTVXAndSel8Full(); + auto readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounterSpan = collisionCount.readCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV(); auto readCollisionWithTVXAndZVertexAndSel8CounterSpan = collisionCount.readCountsWithTVXAndZVertexAndSel8(); + auto readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounterSpan = collisionCount.readCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV(); auto readCollisionWithTVXAndZVertexAndSel8FullCounterSpan = collisionCount.readCountsWithTVXAndZVertexAndSel8Full(); + auto readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounterSpan = collisionCount.readCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV(); auto readCollisionWithTVXAndZVertexAndSel8FullPbPbCounterSpan = collisionCount.readCountsWithTVXAndZVertexAndSel8FullPbPb(); auto readCollisionWithTVXAndZVertexAndSelMCCounterSpan = collisionCount.readCountsWithTVXAndZVertexAndSelMC(); auto readCollisionWithTVXAndZVertexAndSelMCFullCounterSpan = collisionCount.readCountsWithTVXAndZVertexAndSelMCFull(); @@ -192,8 +228,14 @@ struct LuminosityProducer { if (iPreviousDataFrame == 0) { std::copy(readCollisionCounterSpan.begin(), readCollisionCounterSpan.end(), std::back_inserter(previousReadCounts)); std::copy(readCollisionWithTVXCounterSpan.begin(), readCollisionWithTVXCounterSpan.end(), std::back_inserter(previousReadCountsWithTVX)); + std::copy(readCollisionWithTVXAndSel8CounterSpan.begin(), readCollisionWithTVXAndSel8CounterSpan.end(), std::back_inserter(previousReadCountsWithTVXAndSel8)); + std::copy(readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounterSpan.begin(), readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounterSpan.end(), std::back_inserter(previousReadCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV)); + std::copy(readCollisionWithTVXAndSel8FullCounterSpan.begin(), readCollisionWithTVXAndSel8FullCounterSpan.end(), std::back_inserter(previousReadCountsWithTVXAndSel8Full)); + std::copy(readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounterSpan.begin(), readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounterSpan.end(), std::back_inserter(previousReadCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV)); std::copy(readCollisionWithTVXAndZVertexAndSel8CounterSpan.begin(), readCollisionWithTVXAndZVertexAndSel8CounterSpan.end(), std::back_inserter(previousReadCountsWithTVXAndZVertexAndSel8)); + std::copy(readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounterSpan.begin(), readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounterSpan.end(), std::back_inserter(previousReadCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV)); std::copy(readCollisionWithTVXAndZVertexAndSel8FullCounterSpan.begin(), readCollisionWithTVXAndZVertexAndSel8FullCounterSpan.end(), std::back_inserter(previousReadCountsWithTVXAndZVertexAndSel8Full)); + std::copy(readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounterSpan.begin(), readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounterSpan.end(), std::back_inserter(previousReadCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV)); std::copy(readCollisionWithTVXAndZVertexAndSel8FullPbPbCounterSpan.begin(), readCollisionWithTVXAndZVertexAndSel8FullPbPbCounterSpan.end(), std::back_inserter(previousReadCountsWithTVXAndZVertexAndSel8FullPbPb)); std::copy(readCollisionWithTVXAndZVertexAndSelMCCounterSpan.begin(), readCollisionWithTVXAndZVertexAndSelMCCounterSpan.end(), std::back_inserter(previousReadCountsWithTVXAndZVertexAndSelMC)); std::copy(readCollisionWithTVXAndZVertexAndSelMCFullCounterSpan.begin(), readCollisionWithTVXAndZVertexAndSelMCFullCounterSpan.end(), std::back_inserter(previousReadCountsWithTVXAndZVertexAndSelMCFull)); @@ -208,8 +250,14 @@ struct LuminosityProducer { for (unsigned int i = 0; i < previousReadCounts.size(); i++) { // in principle we only care about the first element, but might be interesting information to keep previousReadCounts[i] += readCollisionCounterSpan[i]; previousReadCountsWithTVX[i] += readCollisionWithTVXCounterSpan[i]; + previousReadCountsWithTVXAndSel8[i] += readCollisionWithTVXAndSel8CounterSpan[i]; + previousReadCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV[i] += readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounterSpan[i]; + previousReadCountsWithTVXAndSel8Full[i] += readCollisionWithTVXAndSel8FullCounterSpan[i]; + previousReadCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV[i] += readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounterSpan[i]; previousReadCountsWithTVXAndZVertexAndSel8[i] += readCollisionWithTVXAndZVertexAndSel8CounterSpan[i]; + previousReadCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV[i] += readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounterSpan[i]; previousReadCountsWithTVXAndZVertexAndSel8Full[i] += readCollisionWithTVXAndZVertexAndSel8FullCounterSpan[i]; + previousReadCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV[i] += readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounterSpan[i]; previousReadCountsWithTVXAndZVertexAndSel8FullPbPb[i] += readCollisionWithTVXAndZVertexAndSel8FullPbPbCounterSpan[i]; previousReadCountsWithTVXAndZVertexAndSelMC[i] += readCollisionWithTVXAndZVertexAndSelMCCounterSpan[i]; previousReadCountsWithTVXAndZVertexAndSelMCFull[i] += readCollisionWithTVXAndZVertexAndSelMCFullCounterSpan[i]; @@ -225,8 +273,14 @@ struct LuminosityProducer { } previousReadCounts.push_back(readCollisionCounter); previousReadCountsWithTVX.push_back(readCollisionWithTVXCounter); + previousReadCountsWithTVXAndSel8.push_back(readCollisionWithTVXAndSel8Counter); + previousReadCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV.push_back(readCollisionWithTVXAndSel8AndIsGoodZvtxFT0vsPVCounter); + previousReadCountsWithTVXAndSel8Full.push_back(readCollisionWithTVXAndSel8FullCounter); + previousReadCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV.push_back(readCollisionWithTVXAndSel8FullAndIsGoodZvtxFT0vsPVCounter); previousReadCountsWithTVXAndZVertexAndSel8.push_back(readCollisionWithTVXAndZVertexAndSel8Counter); + previousReadCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV.push_back(readCollisionWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPVCounter); previousReadCountsWithTVXAndZVertexAndSel8Full.push_back(readCollisionWithTVXAndZVertexAndSel8FullCounter); + previousReadCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV.push_back(readCollisionWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPVCounter); previousReadCountsWithTVXAndZVertexAndSel8FullPbPb.push_back(readCollisionWithTVXAndZVertexAndSel8FullPbPbCounter); previousReadCountsWithTVXAndZVertexAndSelMC.push_back(readCollisionWithTVXAndZVertexAndSelMCCounter); previousReadCountsWithTVXAndZVertexAndSelMCFull.push_back(readCollisionWithTVXAndZVertexAndSelMCFullCounter); @@ -237,7 +291,7 @@ struct LuminosityProducer { previousReadCountsWithTVXAndZVertexAndSel7KINT7.push_back(readCollisionWithTVXAndZVertexAndSel7KINT7Counter); previousReadCountsWithCustom.push_back(readCollisionWithCustomCounter); - storedCollisionCountsTable(previousReadCounts, previousReadCountsWithTVX, previousReadCountsWithTVXAndZVertexAndSel8, previousReadCountsWithTVXAndZVertexAndSel8Full, previousReadCountsWithTVXAndZVertexAndSel8FullPbPb, previousReadCountsWithTVXAndZVertexAndSelMC, previousReadCountsWithTVXAndZVertexAndSelMCFull, previousReadCountsWithTVXAndZVertexAndSelMCFullPbPb, previousReadCountsWithTVXAndZVertexAndSelUnanchoredMC, previousReadCountsWithTVXAndZVertexAndSelTVX, previousReadCountsWithTVXAndZVertexAndSel7, previousReadCountsWithTVXAndZVertexAndSel7KINT7, previousReadCountsWithCustom); + storedCollisionCountsTable(previousReadCounts, previousReadCountsWithTVX, previousReadCountsWithTVXAndSel8, previousReadCountsWithTVXAndSel8AndIsGoodZvtxFT0vsPV, previousReadCountsWithTVXAndSel8Full, previousReadCountsWithTVXAndSel8FullAndIsGoodZvtxFT0vsPV, previousReadCountsWithTVXAndZVertexAndSel8, previousReadCountsWithTVXAndZVertexAndSel8AndIsGoodZvtxFT0vsPV, previousReadCountsWithTVXAndZVertexAndSel8Full, previousReadCountsWithTVXAndZVertexAndSel8FullAndIsGoodZvtxFT0vsPV, previousReadCountsWithTVXAndZVertexAndSel8FullPbPb, previousReadCountsWithTVXAndZVertexAndSelMC, previousReadCountsWithTVXAndZVertexAndSelMCFull, previousReadCountsWithTVXAndZVertexAndSelMCFullPbPb, previousReadCountsWithTVXAndZVertexAndSelUnanchoredMC, previousReadCountsWithTVXAndZVertexAndSelTVX, previousReadCountsWithTVXAndZVertexAndSel7, previousReadCountsWithTVXAndZVertexAndSel7KINT7, previousReadCountsWithCustom); } PROCESS_SWITCH(LuminosityProducer, processStoreCollisionCounting, "write out collision counting output table", true); };