rename configurables to fill

Author: Stefanie Mrozinski

PWGEM/PhotonMeson/DataModel/gammaTables.h

@@ -705,7 +705,7 @@ DECLARE_SOA_TABLE(PCMMixLegs, "AOD", "PCMMIXLEG", //!
                   track::HasITS<track::DetectorMap>, track::HasTPC<track::DetectorMap>, track::HasTRD<track::DetectorMap>, track::HasTOF<track::DetectorMap>);
 using PCMMixLeg = PCMMixLegs::iterator;
 
-// free electron legs of builder run 1 (storeFreeLegs): tracks that pass the leg cuts and are the leg of no stored photon; the
+// free electron legs of builder run 1 (fillFreeLegs): tracks that pass the leg cuts and are the leg of no stored photon; the
 // parameters as the V0 fit would use them (TPC-only legs moved to their own collision). The mixer pools them with the photons
 // (cfgPoolFreeLegs), so that run 2 can pair them in the same and the mixed event alike.
 namespace pcmfreeleg

PWGEM/PhotonMeson/TableProducer/createEMEventPhoton.cxx

@@ -68,8 +68,8 @@ struct CreateEMEventPhoton {
   Produces<o2::aod::EMSWTriggerBits> emswtbit;
   Produces<o2::aod::EMEventNormInfos_001> event_norm_info;
   Produces<o2::aod::EMEventsWeight> eventWeights;
-  Produces<o2::aod::EMEventsXY> eventXY;   // only with storeVertex
-  Produces<o2::aod::EMEventsCov> eventCov; // only with storeVertex
+  Produces<o2::aod::EMEventsXY> eventXY;   // filled only with fillVertex
+  Produces<o2::aod::EMEventsCov> eventCov; // filled only with fillVertex
 
   enum class EMEventType : int {
     kEvent = 0,
@@ -78,7 +78,7 @@ struct CreateEMEventPhoton {
     kEvent_JJ = 3,
   };
 
-  Configurable<bool> storeVertex{"storeVertex", false, "write EMEventsXY and EMEventsCov (primary vertex x, y, covariance, chi2), joinable to PMEvents: needed by the co-reconstructed mixed event on derived data (photon-mixed-event-producer processDerived)"};
+  Configurable<bool> fillVertex{"fillVertex", false, "fill EMEventsXY and EMEventsCov (primary vertex x, y, covariance, chi2; the tables are written in any case, empty if false), joinable to PMEvents: needed by the co-reconstructed mixed event on derived data (photon-mixed-event-producer processDerived)"};
   Configurable<bool> needEMCTrigger{"needEMCTrigger", false, "flag to only save events which have kTVXinEMC trigger bit. To reduce PbPb derived data size"};
   Configurable<bool> needPHSTrigger{"needPHSTrigger", false, "flag to only save events which have kTVXinPHOS trigger bit. To reduce PbPb derived data size"};
   Configurable<bool> enableJJHistograms{"enableJJHistograms", false, "flag to fill JJ QA histograms for outlier rejection"};
@@ -153,7 +153,7 @@ struct CreateEMEventPhoton {
             collision.numContrib(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
       eventalias(collision.alias_raw());
 
-      if (storeVertex) {
+      if (fillVertex) {
         eventXY(collision.posX(), collision.posY());
         eventCov(collision.covXX(), collision.covXY(), collision.covXZ(), collision.covYY(), collision.covYZ(), collision.covZZ(), collision.chi2());
       }

PWGEM/PhotonMeson/TableProducer/photonMixedEventProducer.cxx

@@ -15,7 +15,7 @@
 //         per event one same-event artificial event (the complete event) and cfgOverlay mixed artificial events
 //         (the complete event + one complete partner event of its pool, translated to the
 ///        current vertex), written as PCMMixCollisions / PCMMixLegs for photon-conversion-builder-mixed. Needs builder run 1 with
-///        storeLegCov = true and storeFreeLegs = true.
+///        fillLegCov = true and fillFreeLegs = true.
 /// \author Stefanie Mrozinski
 
 #include "PWGEM/PhotonMeson/DataModel/EventTables.h"
@@ -135,7 +135,7 @@ struct PhotonMixedEventProducer {
   Configurable<bool> cfgPhotonWeighted{"cfgPhotonWeighted", true, "partner events drawn with probability proportional to their photon number (each pooled photon equally likely, still N distinct events); false: events equally likely"};
   Configurable<int> cfgInject{"cfgInject", 0, "injection mixed event: instead of N photons from N partner events, K mixed artificial events per event, each = the COMPLETE current event (its photons and, with cfgPoolFreeLegs, its free legs) + ONE photon of a distinct partner event (translated with cfgAlignToVertex). K = cfgInject, -1: K = N (mixed pairs = 2 x same-event pairs), -2: K = N/2 rounded up (mixed pairs = same-event pairs, half the CPU); the pool needs K partner events. Run 2 with mixed_group.skipSameSourceCrossed: the current event's pairings stay as run 1 decided them, only the injected legs form new candidates (also with the free legs, which the N-photon mixed event cannot offer)"};
   Configurable<int> cfgOverlay{"cfgOverlay", 1, "two-event leg overlay: K mixed artificial events per event, each = the COMPLETE current event + the COMPLETE partner event k (all its photons and, with cfgPoolFreeLegs, all its free legs, translated with cfgAlignToVertex). Every leg configuration of the same event exists across the two events, incl. true pairings that failed a run-1 cut. Run 2 with mixed_group.skipSameSourceCrossed: pairings inside one source event stay as run 1 decided them, only cross-event pairings are new. 0 = off (not with cfgInject)"};
-  Configurable<bool> cfgPoolFreeLegs{"cfgPoolFreeLegs", true, "pool the free legs of run 1 (PCMFreeLegs, builder storeFreeLegs) with the photons: the same artificial event gets all M free legs of the event, the mixed one M free legs drawn from the N partner events, so that run 2 pairs free legs identically in both"};
+  Configurable<bool> cfgPoolFreeLegs{"cfgPoolFreeLegs", true, "pool the free legs of run 1 (PCMFreeLegs, builder fillFreeLegs) with the photons: the same artificial event gets all M free legs of the event, the mixed one M free legs drawn from the N partner events, so that run 2 pairs free legs identically in both"};
 
   HistogramRegistry registry{"registry", {}, OutputObjHandlingPolicy::AnalysisObject, false, false};
 
@@ -452,10 +452,10 @@ struct PhotonMixedEventProducer {
                 aod::PCMFreeLegs const* freeLegs, TTracks const* tracks, TMCParticles const* mcParticles)
   {
     if (legs.size() != 2 * photons.size() || legsCov.size() != legs.size()) {
-      LOG(fatal) << "V0LegsCov (" << legsCov.size() << ") / V0Legs (" << legs.size() << ") / V0PhotonsKF (" << photons.size() << ") do not match: run builder run 1 with storeLegCov = true";
+      LOG(fatal) << "V0LegsCov (" << legsCov.size() << ") / V0Legs (" << legs.size() << ") / V0PhotonsKF (" << photons.size() << ") do not match: run builder run 1 with fillLegCov = true";
     }
     if (cfgPoolFreeLegs && (freeLegs == nullptr || (freeLegs->size() == 0 && photons.size() > 0))) {
-      LOG(fatal) << "cfgPoolFreeLegs: PCMFreeLegs is empty, run builder run 1 with storeFreeLegs = true";
+      LOG(fatal) << "cfgPoolFreeLegs: PCMFreeLegs is empty, run builder run 1 with fillFreeLegs = true";
     }
     std::unordered_map<int, std::vector<int64_t>> photonsOfCollision, freeLegsOfCollision;
     for (const auto& photon : photons) {
@@ -767,7 +767,7 @@ struct PhotonMixedEventProducer {
   }
   PROCESS_SWITCH(PhotonMixedEventProducer, processMC, "MC, AO2D input (leg truth into PCMMixLegs)", false);
 
-  // derived data (EM skim with V0LegsCov and, from create-emevent-photon storeVertex, EMEventsXY + EMEventsCov)
+  // derived data (EM skim with V0LegsCov and, from create-emevent-photon fillVertex, EMEventsXY + EMEventsCov)
   void processDerived(MyEvents const& collisions, MyPhotonsDerived const& photons, aod::V0Legs const& legs, aod::V0LegsCov const& legsCov)
   {
     runMixer<false, true>(collisions, photons, legs, legsCov, nullptr, static_cast<aod::TracksIU const*>(nullptr), static_cast<aod::EMMCParticles const*>(nullptr));

PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h

@@ -319,9 +319,9 @@ struct PhotonConversionBuilder {
   Configurable<int> modeTrackPropagation{"modeTrackPropagation", 0, "0: use real track propagation, including material, 1: use fast approximation using only geometry, 2: Use real track propagation and make comparison to fast propagation (only for debugging and testing)"};
   Configurable<float> propV0LegsRadius{"propV0LegsRadius", 60.f, "Radius to which the V0 legs are propagated to calculate psipair and phiV"};
   o2::framework::Configurable<bool> useSideBasedCorrection{"useSideBasedCorrection", false, "when moving TPC-only tracks, use TPC side flags (with legacy fallback) instead of tgl sign"};
-  Configurable<bool> storeLegCov{"storeLegCov", false, "write V0LegsCov: the leg track parameters and covariance given to the V0 fit (TPC-only legs moved to the collision), one row per V0Legs row"};
-  Configurable<bool> storeFreeLegIds{"storeFreeLegIds", false, "write PCMFreeLegIds: the free legs (as for storeFreeLegs) as AO2D (collision, track) indices only, for the mixer on linked derived data (the leg parameters are read from the parent AO2D); only selected collisions"};
-  Configurable<bool> storeFreeLegs{"storeFreeLegs", false, "write PCMFreeLegs: tracks that pass the leg cuts (as the finder takes them) and are the leg of no stored photon, with the parameters the V0 fit would use (TPC-only legs moved to their own collision); pooled by the mixer with cfgPoolFreeLegs"};
+  Configurable<bool> fillLegCov{"fillLegCov", false, "fill V0LegsCov (the table is written in any case, empty if false): the leg track parameters and covariance given to the V0 fit (TPC-only legs moved to the collision), one row per V0Legs row"};
+  Configurable<bool> fillFreeLegIds{"fillFreeLegIds", false, "fill PCMFreeLegIds (the table is written in any case, empty if false): the free legs (as for fillFreeLegs) as AO2D (collision, track) indices only, for the mixer on linked derived data (the leg parameters are read from the parent AO2D); only selected collisions"};
+  Configurable<bool> fillFreeLegs{"fillFreeLegs", false, "fill PCMFreeLegs (the table is written in any case, empty if false): tracks that pass the leg cuts (as the finder takes them) and are the leg of no stored photon, with the parameters the V0 fit would use (TPC-only legs moved to their own collision); pooled by the mixer with cfgPoolFreeLegs"};
 
   // deduplication settings
   struct : ConfigurableGroup {
@@ -492,7 +492,7 @@ struct PhotonConversionBuilder {
     "registry",
     {
       {"hCollisionCounter", "hCollisionCounter", {HistType::kTH1F, {{1, 0.5f, 1.5f}}}},
-      {"hNFreeLegs", "free legs written per DF (storeFreeLegs);legs;DFs", {HistType::kTH1F, {{200, 0.f, 20000.f}}}},
+      {"hNFreeLegs", "free legs filled per DF (fillFreeLegs);legs;DFs", {HistType::kTH1F, {{200, 0.f, 20000.f}}}},
       {"V0/hAP", "Armenteros Podolanski;#alpha;q_{T} (GeV/c)", {HistType::kTH2F, {{200, -1.0f, 1.0f}, {250, 0, 0.25}}}},
       {"V0/hConversionPointXY", "conversion point in XY;X (cm);Y (cm)", {HistType::kTH2F, {{400, -100.0f, 100.0f}, {400, -100.f, 100.f}}}},
       {"V0/hConversionPointRZ", "conversion point in RZ;Z (cm);R_{xy} (cm)", {HistType::kTH2F, {{200, -100.0f, 100.0f}, {200, 0.f, 100.f}}}},
@@ -982,7 +982,7 @@ struct PhotonConversionBuilder {
               trackParCov.getSnp(), trackParCov.getTgl(), trackParCov.getQ2Pt(), cov.data());
   }
 
-  // free legs (storeFreeLegs): after the tables are written; a track that passes the leg cuts, has a collision and the TPC (as the
+  // free legs (fillFreeLegs): after the tables are written; a track that passes the leg cuts, has a collision and the TPC (as the
   // finder takes them) and is the leg of no stored photon; TPC-only legs moved to their own collision as in the fit
   template <bool isMC, class TBCs, class TCollisions, class TTracks>
   void writeFreeLegs(TCollisions const& collisions, TTracks const& tracks, std::set<int64_t> const& skimRejected)
@@ -1009,11 +1009,11 @@ struct PhotonConversionBuilder {
           continue;
         }
       }
-      if (storeFreeLegIds) { // tracks are visited in increasing index order: store the difference to the previous free leg of this DF
+      if (fillFreeLegIds) { // tracks are visited in increasing index order: store the difference to the previous free leg of this DF
         pcmfreelegids(track.collisionId(), static_cast<int>(track.globalIndex() - lastFreeLegTrack));
         lastFreeLegTrack = track.globalIndex();
       }
-      if (!storeFreeLegs) {
+      if (!fillFreeLegs) {
         ++nFree;
         continue;
       }
@@ -1644,7 +1644,7 @@ struct PhotonConversionBuilder {
 
       fillTrackTable<isMC>(pos, kfp_pos_DecayVtx, posdcaXY, posdcaZ); // positive leg first
       fillTrackTable<isMC>(ele, kfp_ele_DecayVtx, eledcaXY, eledcaZ); // negative leg second
-      if (storeLegCov) {
+      if (fillLegCov) {
         fillLegCovTable(pTrack);
         fillLegCovTable(nTrack);
       }
@@ -2661,7 +2661,7 @@ struct PhotonConversionBuilder {
       fitV0Candidate<isMC, TBCs, TCollisions, TTracks>(collision, tracks.rawIteratorAt(fullv0Id.posId), tracks.rawIteratorAt(fullv0Id.eleId), v0Id, true,
                                                        FitOptions{.nonSVertexer = !recovery.finderUniformFit.value, .relaxAP = mRelaxedKeys.contains(fullv0Id) && !recovery.finderUniformFit.value});
     } // end of fullv0Id loop
-    if (storeFreeLegs || storeFreeLegIds) {
+    if (fillFreeLegs || fillFreeLegIds) {
       writeFreeLegs<isMC, TBCs, TCollisions, TTracks>(collisions, tracks, skimRejected);
     }