From 4fcc1ae8e3573bbef6256097031c37dd6e8c1e7f Mon Sep 17 00:00:00 2001 From: smaff92 <33285879+smaff92@users.noreply.github.com> Date: Fri, 22 Dec 2023 03:54:12 +0900 Subject: [PATCH] Changes to Phi-in-jets (#4213) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated and new commit of Phi in Jet tasks for PWGJE * update of phi-in-jets analysis task, fixed bug in jet finding * Please consider the following formatting changes * PWGHF: fix processMc for sigmac. (#3844) * PWGHF: fix processing on MC for SigmaC. * Use TESTBIT to check flagMcMatchRec Co-authored-by: Fabrizio --------- Co-authored-by: Mattia Faggin Co-authored-by: Fabrizio * [PWGHF] Implemented selection on DeltaMass (KK,Phi) for Ds in track index skim creator (#3862) * Implemented cut on delta mass phi for Ds * Refactored the selections and updated 2prongs code for consistency * Please consider the following formatting changes * Update PWGHF/TableProducer/trackIndexSkimCreator.cxx Co-authored-by: Fabrizio * Apply suggestions from code review Co-authored-by: Fabrizio * Implemented suggestions --------- Co-authored-by: ALICE Action Bot Co-authored-by: Fabrizio * PWGCF FemtoUniverse PairCleaner update for track-v0 (#3877) * fixed track-v0 pair check * clang-format check done --------- Co-authored-by: Shirajum Monira * PWGEM/PhotonMeson: fix for Join (#3881) * PWGLF: Update lambda1520SpherocityAnalysis.cxx (#3878) * Rework of the multiplicity and PVcontribs axis ranges settings (#3883) * Correct a typo * Reworking axis for multiplicity and PV contribs. Now, collision system dependent. Seems it is working. Resetting ranges. * Resetting the default axis to be in ideal for pp 500kHz and PbPb50kHz * even more generous ranges for PbPb * Rework of the default PbPb axis ranges. Going back to one ConfigurableAxis and placing the default values in the init. Now, this is controlled solely by defaultPbPb bool, which is by default false * Renaming of the switch * cang formatting * clang formatting wrt origin master * PWGHF: Add more centrality estimators (#3880) * PWGHF: Add more centrality estimators * Define more process functions to consume only one centrality table at a time * Remove unncecessary template and fix filling of histo * Update PWGHF/TableProducer/trackIndexSkimCreator.cxx Co-authored-by: Vít Kučera * Update PWGHF/TableProducer/trackIndexSkimCreator.cxx Co-authored-by: Vít Kučera * Add missing arguments * Fix enum names --------- Co-authored-by: Vít Kučera * PWGDQ: Fix filling of D meson histos in D-JPsi analysis (#3884) * Add histograms about tpc(and its) vs. signed pt (#3882) * Modification on hypertriton 3body decay finder method (#3887) * Fix bug and modify histos * Change processMC * Update finder method * Update finder method * Formatting * pDCAcutOptimization (#3869) * Update HistogramsLibrary.cxx Dimuon-polarization using THnSpase for cosTheta and Phi * Please consider the following formatting changes * Update HistogramsLibrary.cxx * Update HistogramsLibrary.cxx --------- Co-authored-by: ALICE Action Bot * PWGJE : Introduction of MB selection (#3888) * Introduction of MB selection * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot * [PWGLF] bugfix in momentum resolution: multiply pt_rec by particle charge (#3890) * PWGHF: fix filling of some MC histos and re-order inv. mass histos for signal. (#3889) Co-authored-by: Mattia Faggin * [O2-4360] First implementation of cluster-matchedtracks-writer (#3892) - First version of the table producer that was asked for in the linked JIRA ticket * [PWGDQ] Adding process function for muons with cov and filters (#3897) * Adding process function for muons with cov and filters * Fix clang --------- Co-authored-by: Luca Micheletti * Add daughter information in table (#3898) * PWGEM/PhotonMeson: add QA histograms for e/mu (#3894) * [O2-4360] EMCALMatchedTracks: Add QPt column (#3899) - Add QPt column to the table * more PID scenarios (#3896) * Split even more multiplicities (#3891) - Split table for barrel multiplicity - Add proto MC multiplicities - Add fatal in case mult is misconfigured and Zeq is requested * PWGMM/Tasks/multiplicityPbPb.cxx modification (#3904) * PWGEM/PHOTONMESON: Add RPhi dependence plots (#3853) * PWGEM/PhotonMeson: update on event mixing for dileptons (#3905) * PWGEM/PhotonMeson: update dilepton QC MC (#3906) * [PWGLF] Change V0 Cos PA to regular column for filterability (#3834) * Change V0 Cos PA to regular for filter-ability * Please consider the following formatting changes (#183) --------- Co-authored-by: ALICE Builder * Removing unused histograms (#3901) * [Common/event plane determination] making sub tables and saving track id (#3907) * making sub tables and saving track id * fix * fix * fix * Please consider the following formatting changes --------- Co-authored-by: junleekim Co-authored-by: ALICE Action Bot * EventFiltering/PWGHF: remove obsolete task and add new task to check charm signals with trigger selections (#3895) * EventFiltering/PWGHF: remove obsolete task and add new task to check charm signals with trigger selections * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot * Fix ordering in table (#3909) * PWGMM: dndeta: rework (#3910) * Add "processDecayToEESkimmedWithColl" to the init function of the AnalysisSameEventPairing task in tableReader.cxx (#3885) * Skip DF with 0 collisions (#2351) * PWGHF: Add KFParticle to D0 creator * PWGHF: Added topological chi2 to HfCand2Prong table * PWGHF: Add topological chi2 to treeCreatorD0ToKPi * PWGHF: Added histograms for D0 and D0bar after topological constraint * PWGHF: Add geometrical mass to the output table * PWGHF: Use the extra table to store KFParticle topological chi2 and geometrical mass * PWGHF: git-cland-format for candidateCreator2Prong * PWGHF:git-clang-format * PWGHF: candidateCreator2Prong.cxx with git-clang-format * PWGHF: optimize the code to add Kf to D0 * PWGHF: candidateSelectorD0.cxx conflict fix * Merge commit '76acd5f6ff94b2fa82fd234526cf84f09daf68a9', fix conflicts in PWGHF/TableProducer/candidateCreatorD0.cxx * Updates for adding KF to HF-D0 * git-clang-format for "PWGHF/DataModel/CandidateReconstructionTables.h" * PWGHF: Try to respect the grouping and sorting of the head files * Update PR * Update PR * PWGHF: update PR * PWGHF: update git-clang-format * PWGHF: update PR * PWGHF: update PR * Remove unused variables in runCreator2ProngWithKFParticle * PWGDQ: Add "processDecayToEESkimmedWithColl" to the init function of the AnalysisSameEventPairing task in tableReader.cxx --------- Co-authored-by: Maximiliano Puccio Co-authored-by: Chiara Zampolli * [PWGDQ] Add function to propagate muon tracks through absorber to PV (#3762) * Add function to propagate muon tracks through absorber to PV * Format * Fix * Fix * Fix typo * Fixing libraries * Clang format * Missing array definition * Retrieving geometry from ccdb * Clang format * Fixing retrieving of ccdb object * Calng format * Fixing covariance name * F1 ptableordering (#3914) * Fix ordering in table * Add TOF hit information of daughter * fix search of missing tpc segment + add mc truth info in tag and probe (#3917) * PWGMM: dndeta: create separate directories for registries (#3915) * Femto 3D table producer (#3893) * update the Femto3D's data model as requested --------- Co-authored-by: Nicolò Jacazio Co-authored-by: ALICE Action Bot * PWGMM/Tasks/multiplicityPbPb.cxx TPC cut removed (#3918) * Example pcm qa at builder (#3920) * Example pcm qa at builder * Require TPC only * Please consider the following formatting changes (#187) * true TPC only ONLY --------- Co-authored-by: David Dobrigkeit Chinellato Co-authored-by: ALICE Builder * Update Track Propagation (#3921) - reserve room for tracks and DCA * Incorrect preslice (#3912) * PWG-UD: Single Gap producer (#3879) * Single Gap producer, Paul's comments, mistype fixed * Please consider the following formatting changes * Update UDHelpers.h Removed CleanFitACollisions and CleanFitCCollision which are not ysed by the SGSelector --------- Co-authored-by: alexandr.bylinkin@cern.ch Co-authored-by: ALICE Action Bot * [PWGDQ] Write eventfilter to 32 highest bits of tag column in reducedEvents (#3922) * EventFiltering: fix missing magnetic field for track propagation (#3924) * EventFiltering: fix missing magnetic field for track propagation * Remove whitespace * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot * EventFiltering: fix propagation for V0s and cascades in charm decays (#3923) * EventFiltering: fix propagation for V0s and cascades in charm decays * Set proper masses for propagation * Set proper masses for propagation * Adding D0 meson as a particle type (#3925) * PWGHF: fix and update cascade-bachelor index skimming (#3886) * Update cascade-bachelor skimming * Remove symbols * Remove symbols * Update authors * Continue development * Continue development * Continue development * Continue development * Continue development * Please consider the following formatting changes * Fix missing ; * Fix errors * Implement suggestions * Please consider the following formatting changes * Implement suggestions * Update PWGHF/TableProducer/trackIndexSkimCreator.cxx Co-authored-by: Fabrizio * Update PWGHF/TableProducer/trackIndexSkimCreator.cxx Co-authored-by: Fabrizio * Use different xi trackParCov for 3prong * Change default configurable and catch propagation exceptions * Please consider the following formatting changes * Remove hfFlag for 3prong --------- Co-authored-by: ALICE Action Bot Co-authored-by: Fabrizio * Improve strangeness tracking filtering (#3928) - propagate tracks for mass calculation - additional histograms for selected Xi/Omega - add cosine pointing angle - require minimum number of TPC clusters for daughters * Update singletrackselector.h (#3926) Fixing table names. * PWGLF: Update hypertriton 3body decay analysis (#3929) * Add check histo for virtual lambda * "Add mass cut for hypertriton" * Fix bug * Update 3body analysis * Update 3body builder method Add Deuteron TOF cut Change configurables Fix dcatopv bug * Delete useless comments * Fix dca bug in finder and formatting * Update 3body analysis Fix bugs in findermethod Change TOF PID cut * Small Change on QA histo * Extra builder QA (#3931) * Extra builder QA * Please consider the following formatting changes (#188) --------- Co-authored-by: ALICE Builder * PWGHF: change configurable default values for struct LfCascade (#3934) * Change configurable default values * Change configurable default values * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot * Add task for measurement of nuclei in jets and ue (#3935) * Add task for measurement of nuclei in jets and ue * Use static_cast -> Fixed * fixed static cast * EventFiltering/PWGHF: fix small bugs (#3932) * EventFiltering/PWGHF: fix small bugs * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot * PWGHF: improve cascade preselection in toXiPi creator (#3927) * Improve cascade preselection * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot * [BUG] Incorrect Preslice (#3936) * add the cut for the PWGDQ skimmed tree production (#3930) * PWGDQ/EM: PDG in history: check only for mother (comment out: check of daughter), adapt and add new MC Signals (#3938) * Add id hypo in dedx plot (#3940) * Update HistogramsLibrary.cxx (#3814) * Update HistogramsLibrary.cxx add multiplicity for pp collision * Update HistogramsLibrary.cxx * Update HistogramsLibrary.cxx * Update HistogramsLibrary.cxx * PWGMM: dndeta: add ITS ROF border check (#3945) * PWGDQ: MuonMchTrkEfficiency adjust eta bins (#3937) * PWGDQ: MuonMchTrkEfficiency adjust eta bins * Fix clang-format * PWGDQ: fix JPsi-D derived tables filling and add BDT score in histos (#3947) * PWGHF: adding the info about the number of prongs that contributes to the PV estimation in the candidate creator. (#3948) * PWGHF: adding the info about the number of prongs that contributes to the PV calculation * indentation fix * fix clang --------- Co-authored-by: Luigi Dello Stritto * PWJGE : Adding multiplicity correlations (#3933) * add correlation of Multiplicity measures * clang formatting * Fix HistoType * Fix typo * fixing datamodel and extend with FT0A,C * clang formatting * fix type * Fix runtime problems * Fix runtime problem * remove white spaces * first try in fixing the bug (#3950) * Add abs value to dca cut (#3943) * ML, PWGHF: add possibility to pass multiple CCDB paths to fix issue with ccdbApi.retrieveBlob (#3952) * ML, PWGHF: add possibility to pass CCDB paths * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot * Fix strangeness tracking filter (#3953) - fix bachelor masses used for invariant mass calculation - adjust histogram binning - add option to cut on CPA and DCA * [PWGLF] Strangeness data model improvements (#3946) * Modifications to V0 part mostly done * Changes to enable derived data directly from builders * Equiv declarations * Please consider the following formatting changes (#189) --------- Co-authored-by: ALICE Builder * [PWFLG] LightNucleiTask - Add pT-shift for charge (#3951) * PWGEM/PhotonMeson: update for relaxed v0 cut (#3957) * PWGEM/PhotonMeson: add protection for mass (#3958) * add HistogramManager's workflow to v0selector (#3949) * second try to fix the bug (#3961) * Fix Track Selection (#3963) Co-authored-by: Andrea Barra * EventFiltering/PWGHF: make axes configurable to tune memory (#3962) * PWGMM: dndeta: avoid clashing variables (#3960) * MC support in rsnanalysisTHnSparse workflow (#3964) * MC support in rsnanalysisTHnSparse workflow * Update * name change --------- Co-authored-by: Veronika Barbasova * PWGHF: Improve tree creator for Omega_c with ST (#3956) * Improve tree creator for Omega_c with ST - implement improvements from ST filter to tree creator - add missing variables to tree * [PWGLF] Fix subscriptions + add customizability (#3965) * fix subscription in cascadepid.cxx * fix subscription in lambdakzeropid.cxx * Add skipper for empty colls * Add skipper for empty colls * Please consider the following formatting changes (#190) --------- Co-authored-by: ALICE Builder * PWGMM: dndeta: separate generator-level counters (#3966) * PWGHF: Add number of primary-vertex contributors in the 2-prong candidate creator (#3954) * add histograms to mc tag and probe + add flag for vertex refit (#3968) * Next centrality (#3971) * Next centrality * Update table helper * PWGHF: implement check on prompt/non prompt toXiPi tasks (#3955) * Implement origin check * Please consider the following formatting changes * Do check at quark level * Update PWGHF/TableProducer/candidateCreatorToXiPi.cxx Co-authored-by: Fabrizio * Update PWGHF/TableProducer/candidateCreatorToXiPi.cxx Co-authored-by: Fabrizio * Implement change OriginType::None --------- Co-authored-by: ALICE Action Bot Co-authored-by: Fabrizio * PWGJE : Adding pTHat histograms (#3911) Fixing format errors Fixing format errors Fixing merge Adding minor changes from Nima Added changes from Nima Adding pTHat histograms Changed float to int Adding pTHat histograms Co-authored-by: Danny Jones * Update cascadepid.cxx (#3974) * Update V0 analysis task (#3978) * Update v0qaanalysis.cxx --------- Co-authored-by: Nicolò Jacazio * Add 3body-decay hypertriton in nuclei filter (#3980) * Fixing the index format for MFT in ReducedMuonsExtra (#3977) Co-authored-by: Luca Micheletti * Add monitoring of the delta momentum (#3981) * PWGEM/PhotonMeson: implement prefilter for dielectron (#3982) * PWGHF: fix track selection in index skimming LfCascades (#3979) * Fix track selection * Please consider the following formatting changes * reinclude filter LfCascades * Fix build error * Fix filter for cascades struct --------- Co-authored-by: ALICE Action Bot * [O2-4360] EMCALMatchedTracks: Add track alpha and TOF PID (#3983) - Add track alpha and TOF PID NSgima for electrons and pions * third try to fix the bug (#3984) * third try to fix the bug * third try * PWGEM/PhotonMeson: fix for prefilter (#3987) * PWGEM/PhotonMeson: update phiv cut for dielectron (#3988) * Centrality: Fix run2 check (#3985) * Clean LF centrality/multiplicity table sub. (#3986) * Update HMPID qa (#3991) * Update spectratof (#3990) * (tried to) fix jet finder part (#3992) * PWGJE : jetmatching: add comments and rename vars to be clearer (#3975) * Update UDHelpers.h (#3969) * PWGLF: Update lambda1520SpherocityAnalysis.cxx (#3997) * PWGLF: Update lambda1520SpherocityAnalysis.cxx * PWGLF: Update lambda1520SpherocityAnalysis.cxx * Align TOF config automatically (#3993) - extend tools for intertask comms * Track propagation with ID (#3989) * Track propagation with ID * Update trk utils * Allow running slightly more parallel analysis compile jobs (#3972) On build machines with little memory, such as the ARM VMs we have been allocated, compiling with the previous formula takes much too long (5 hours just for O2Physics). On those machines, reserving 4 GiB for the system is overkill and cuts down the number of build slots unnecessarily. Reducing this to 2 GiB allows us to squeeze in one more build slot, bringing the total to 3 instead of 2. The peak memory use per analysis build process looks accurate at around 4 GiB. In theory, this change should reduce the time taken for analysis compilation on those machines by 1/3. * [PWGLF] Strangeness data model improvement (#3998) * Extra work * Rename file * Improvements and adjustments * Cleanup * Please consider the following formatting changes (#191) --------- Co-authored-by: ALICE Builder * PWGHF: Implement the possibility to apply proton PID for baryons in skimming (#3939) * PWGHF: Implent the possibility to apply proton PID for baryons in HF finding * Please consider the following formatting changes * Restore author removed by mistake * Remove all MY_DEBUG instances * Restore line wrongly deleted * Fallback to fill PVrefit table for all tracks at once to avoid crash due to tracks with no collision * Move initialisation of whichHypo * Add check on hasTPC and hasTOF in case of single detector PID * Remove extra slash --------- Co-authored-by: ALICE Action Bot * added QC histo for leading track (#4000) * PWGHF: implementation of LcToK0Sp ML responce class and corresponding changes in the LcToK0Sp canidate selector (#3913) * implemed first version of LcToK0sP ML response class and corresponding changes in the LcToK0sP candidate selector * fixing whitespace error * Add files via upload * implemented comments about removing variables not useful for ML * Update PWGHF/Core/HfMlResponseLcToK0sP.h Co-authored-by: Fabrizio * Update PWGHF/Core/HfMlResponseLcToK0sP.h Co-authored-by: Fabrizio * Update PWGHF/Core/HfMlResponseLcToK0sP.h Co-authored-by: Fabrizio --------- Co-authored-by: Fabrizio * task for vn of helium3 and helium4 (#4001) * New cuts for jpsi2ee electron selection (#3959) * New cuts for jpsi2ee electron selection * Error fixes + new cuts * VDM AO2D task for FIT detectors (#4002) * [FIT] Add more QA plots for FIT detectors and correlation among them * VDM AO2D task for FIT detectors * Update QAHistTask.cxx (#4003) Added Ka & Pi. * PWGHF: implement worflow to run on LfCascadeBachelor derived data and fix track selection in toXiPi tasks (#3973) * PWGLF: Add task to study track propagation (#4004) * Add task to study track propagation * Formatting * [PWGLF] Bugfixes in new part (#3999) * Fix subscriptions once more * Update LFStrangenessTables.h * Add simple mc-generated histograms * Please consider the following formatting changes (#192) * Create V0-only path --------- Co-authored-by: ALICE Builder * fixed pointer to leading track (#4008) * Unify headers with mass constants (#3976) * PWGHF: change filter -> testbit in toXiPi creator (#4009) * Change filter -> testbit * Please consider the following formatting changes * Change to cast in filter * Please consider the following formatting changes * Update PWGHF/TableProducer/candidateCreatorToXiPi.cxx Co-authored-by: Vít Kučera --------- Co-authored-by: ALICE Action Bot Co-authored-by: Vít Kučera * PWGDQ: Improve filterPbPb and add muon process function (#4015) * PWGDQ: Bugfix filterPbPb * Formatting * PWGLF: Update the common column name (#4013) * Update colum name to general type * Efficient process by defining the multiplicity * Please consider the following formatting changes --------- Co-authored-by: ALICE Action Bot * PWGHF: Fix tree creator for Omega_c using ST (#4005) * Fix tree creator for Omega_c using ST - add charge of Omega and bachelor - fix track association - streamlining - update histograms * Fix sign in Omega_c ST tree * PWGLF: Update cuts for 3-body decayed hypertriton (#4017) * Update and Fix bugs * Add daughter track check in processMC * Add DcaToPV cut for H3L and Fix bugs * Fixes for C++20 (#4014) * PWGCF: Update trigger (#4007) * PWGCF: Update trigger Add options to reject tracks whose assumed PID during tracking does not correspond to the selected PID selected in the analysis. This rejection can be turned on/off with a switch and can be applied up to a configurabel p_TPC threshold. It can also be configured independently for protons and deuterons. * Fix: fix linter complaint * (try to) fix the track index (#4019) * Fix ST selection for strangeness filter (#4010) - wrong variable used for DCA cut (so far unused) * [PWGLF] - Improvemnts of nsigma handling (#4012) Co-authored-by: Veronika Barbasova * PWGDQ: Vertexing for pair and triplet (2 and 3 prong decays) (#3944) Updates for the dilepton-track secondary vertexing analysis Co-authored-by: Ida Torkjellsdatter Storehaug Co-authored-by: Ida Torkjellsdatter Storehaug Co-authored-by: ALICE Action Bot * More minor adjustments to data model (#4022) * Final adjustments to data model * Please consider the following formatting changes (#193) * Update strangederivedbuilder.cxx --------- Co-authored-by: ALICE Builder * update the post-calibration of TPC (#4023) * Add TRD sel. (#4021) - add possibility to customize cuts * Add pt vs ptreco (#4020) * Reverted back to ROOT PDG features * Cleaned up white-space issues * Cleaned up white-space issues 2.0 * Cleaned up white-space issues 3.0 * Utilizing CommonConstants/PhysicsConstants * Added basic debug functionality * Added basic debug functionality * Please consider the following formatting changes * MegaLinter fixes --------- Co-authored-by: ALICE Action Bot Co-authored-by: Mattia Faggin Co-authored-by: Mattia Faggin Co-authored-by: Fabrizio Co-authored-by: Fabrizio Chinu <91954233+fchinu@users.noreply.github.com> Co-authored-by: eloviyo <38348689+Eloviyo@users.noreply.github.com> Co-authored-by: Shirajum Monira Co-authored-by: Daiki Sekihata Co-authored-by: Yash Patley <52608802+yashpatley@users.noreply.github.com> Co-authored-by: rolavick Co-authored-by: Vít Kučera Co-authored-by: ypwangg <142303052+ypwangg@users.noreply.github.com> Co-authored-by: yuanzhe <90246048+wang-yuanzhe@users.noreply.github.com> Co-authored-by: Bhagyarathi Sahoo <125358702+bhsaho@users.noreply.github.com> Co-authored-by: fkrizek Co-authored-by: ivorobye Co-authored-by: Marvin Hemmer <53471402+mhemmer-cern@users.noreply.github.com> Co-authored-by: lucamicheletti93 <38209984+lucamicheletti93@users.noreply.github.com> Co-authored-by: Luca Micheletti Co-authored-by: skundu692 <86804743+skundu692@users.noreply.github.com> Co-authored-by: rbailhac Co-authored-by: Nicolò Jacazio Co-authored-by: hhesouno <119694396+hhesouno@users.noreply.github.com> Co-authored-by: Felix Schlepper Co-authored-by: ddobrigk Co-authored-by: ALICE Builder Co-authored-by: Andrea Sofia Triolo Co-authored-by: Junlee Kim Co-authored-by: junleekim Co-authored-by: Anton Alkin Co-authored-by: Lu, Pengzhong <55934557+lupengzhong@users.noreply.github.com> Co-authored-by: Maximiliano Puccio Co-authored-by: Chiara Zampolli Co-authored-by: mcoquet642 <74600025+mcoquet642@users.noreply.github.com> Co-authored-by: Mario Ciacco Co-authored-by: glromane <95305986+glromane@users.noreply.github.com> Co-authored-by: Sasha Bylinkin <37345380+abylinkin@users.noreply.github.com> Co-authored-by: alexandr.bylinkin@cern.ch Co-authored-by: Sigurd Nese <32108009+sigurdnese@users.noreply.github.com> Co-authored-by: kgwizdzi <116073883+kgwizdzi@users.noreply.github.com> Co-authored-by: Federica Zanone <94552525+ZFederica@users.noreply.github.com> Co-authored-by: Jochen Klein Co-authored-by: alcaliva <32872606+alcaliva@users.noreply.github.com> Co-authored-by: XiaozhiBai Co-authored-by: feisenhu <53603353+feisenhu@users.noreply.github.com> Co-authored-by: ahkhanm <37612045+ahkhanm@users.noreply.github.com> Co-authored-by: zconesa Co-authored-by: ldellost <47105254+DelloStritto@users.noreply.github.com> Co-authored-by: Luigi Dello Stritto Co-authored-by: Johanna Lömker Co-authored-by: Giovanni Malfattore <89481844+giovannimalfattore@users.noreply.github.com> Co-authored-by: Zhenjun Xiong <108917659+zjxiongOvO@users.noreply.github.com> Co-authored-by: brr-andrea <60464995+brr-andrea@users.noreply.github.com> Co-authored-by: Andrea Barra Co-authored-by: vbarbaso <146095385+vbarbaso@users.noreply.github.com> Co-authored-by: Veronika Barbasova Co-authored-by: dajones2 <140733426+dajones2@users.noreply.github.com> Co-authored-by: Danny Jones Co-authored-by: Francesca Ercolessi Co-authored-by: Nicolò Jacazio Co-authored-by: aimeric-landou <46970521+aimeric-landou@users.noreply.github.com> Co-authored-by: Timo Wilken Co-authored-by: emeninno <41640762+emeninno@users.noreply.github.com> Co-authored-by: vfeuilla <71069003+vfeuilla@users.noreply.github.com> Co-authored-by: arvindkhuntia <31609955+arvindkhuntia@users.noreply.github.com> Co-authored-by: Rafael Manhart <56776511+RafRaf11@users.noreply.github.com> Co-authored-by: creetz16 <79141119+creetz16@users.noreply.github.com> Co-authored-by: Bong-Hwi Lim Co-authored-by: Giulio Eulisse <10544+ktf@users.noreply.github.com> Co-authored-by: ariedel-cern <85537041+ariedel-cern@users.noreply.github.com> Co-authored-by: Ida Storehaug <38440296+torkjellsdatter@users.noreply.github.com> Co-authored-by: Ida Torkjellsdatter Storehaug Co-authored-by: Ida Torkjellsdatter Storehaug Co-authored-by: BiaoZhang <52267892+zhangbiao-phy@users.noreply.github.com> --- PWGJE/Tasks/phiInJets.cxx | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/PWGJE/Tasks/phiInJets.cxx b/PWGJE/Tasks/phiInJets.cxx index 35025786b68..16e42aa8fe4 100644 --- a/PWGJE/Tasks/phiInJets.cxx +++ b/PWGJE/Tasks/phiInJets.cxx @@ -32,7 +32,7 @@ #include "Common/DataModel/EventSelection.h" #include "Common/DataModel/TrackSelectionTables.h" #include "Common/DataModel/Multiplicity.h" -//#include "Common/DataModel/Centrality.h" +// #include "Common/DataModel/Centrality.h" #include "Common/DataModel/PIDResponse.h" #include "CommonConstants/PhysicsConstants.h" @@ -70,6 +70,7 @@ struct phiInJets { Configurable cfgnTOFPID{"cfgnTOFPID", 4, "nTOF PID"}; Configurable cfgjetPtMin{"cfgjetPtMin", 5.0, "minimum jet pT cut"}; Configurable cfgjetR{"cfgjetR", 0.4, "jet resolution parameter"}; + Configurable cDebugLevel{"cDebugLevel", 0, "Resolution of Debug"}; // CONFIG DONE ///////////////////////////////////////// //INIT @@ -308,8 +309,13 @@ struct phiInJets { } // MinvReconstruction int nEvents = 0; - void processJetTracks(aod::JCollision const& collision, soa::Filtered const& fulljets, soa::Join const& tracks, TrackCandidates const&) + void processJetTracks(aod::JCollision const& collision, soa::Filtered const& chargedjets, soa::Join const& tracks, TrackCandidates const&) { + if (cDebugLevel > 0) { + nEvents++; + if ((nEvents + 1) % 10000 == 0) + std::cout << nEvents << std::endl; + } JEhistos.fill(HIST("nEvents"), 0.5); if (!JetDerivedDataUtilities::selectCollision(collision, eventSelection)) @@ -318,12 +324,12 @@ struct phiInJets { for (auto& [track1, track2] : combinations(o2::soa::CombinationsFullIndexPolicy(tracks, tracks))) { auto trk1 = track1.track_as>(); auto trk2 = track2.track_as>(); - minvReconstruction(1.0, trk1, trk2, fulljets); + minvReconstruction(1.0, trk1, trk2, chargedjets); } - for (auto fulljet : fulljets) { - JEhistos.fill(HIST("FJetaHistogram"), fulljet.eta()); - JEhistos.fill(HIST("FJphiHistogram"), fulljet.phi()); - JEhistos.fill(HIST("FJptHistogram"), fulljet.phi()); + for (auto chargedjet : chargedjets) { + JEhistos.fill(HIST("FJetaHistogram"), chargedjet.eta()); + JEhistos.fill(HIST("FJphiHistogram"), chargedjet.phi()); + JEhistos.fill(HIST("FJptHistogram"), chargedjet.pt()); } JEhistos.fill(HIST("nEvents"), 1.5);