Skip to content

Commit d9e668a

Browse files
committed
Cleanup configurable names
1 parent cc88084 commit d9e668a

1 file changed

Lines changed: 60 additions & 59 deletions

File tree

‎PWGHF/TableProducer/candidateCreatorXic0Omegac0Qa.cxx‎

Lines changed: 60 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -92,45 +92,46 @@ struct HfCandidateCreatorXic0Omegac0Qa {
9292
Produces<HfCandCascBachKfQa> rowCandCascBatchKf;
9393

9494
struct : ConfigurableGroup {
95+
std::string prefix = "lfBuilding";
9596
// Options for internal cascade building - DCAFitter settings
9697
// ...Initial vaules taken from PWGLF/Utils/strangenessBuilderHelper
97-
Configurable<bool> propagateToPCALF{"propagateToPCALF", true, "Create tracks version propagated to PCA"};
98-
Configurable<double> maxRLF{"maxRLF", 200., "Reject PCA's above this radius"};
99-
Configurable<double> maxDZIniLF{"maxDZIniLF", 1e9, "Reject (if>0) PCA candidate if tracks DZ exceeds this threshold"};
100-
Configurable<double> maxDXYIniLF{"maxDXYIniLF", 4.0f, "Reject (if>0) PCA candidate if tracks DXY exceeds this threshold"};
101-
Configurable<double> minParamChangeLF{"minParamChangeLF", 1.e-3, "Stop iteration if largest change of any X is smaller than this"};
102-
Configurable<double> minRelChi2ChangeLF{"minRelChi2ChangeLF", 0.9, "Stop iteration if Chi2/Chi2old > this"};
103-
Configurable<double> maxChi2LF{"maxChi2LF", 1e9, "Discard vertices with Chi2/Nprongs > this(or sum {DCAi^2}/Nprongs for abs. distance minimization)"};
104-
Configurable<bool> useAbsDCALF{"useAbsDCALF", true, "Minimise abs. distance rather than chi2"};
105-
Configurable<bool> useWeightedFinalPCALF{"useWeightedFinalPCALF", false, "Recalculate vertex position using track covariance, effective only if useAbsDCA is true"};
106-
Configurable<bool> refitWithMaterialCorrectionLF{"refitWithMaterialCorrectionLF", false, "Do refit after material correction applied"};
98+
Configurable<bool> propagateToPCA{"propagateToPCA", true, "Create tracks version propagated to PCA"};
99+
Configurable<double> maxR{"maxR", 200., "Reject PCA's above this radius"};
100+
Configurable<double> maxDZIni{"maxDZIni", 1e9, "Reject (if>0) PCA candidate if tracks DZ exceeds this threshold"};
101+
Configurable<double> maxDXYIni{"maxDXYIni", 4.0f, "Reject (if>0) PCA candidate if tracks DXY exceeds this threshold"};
102+
Configurable<double> minParamChange{"minParamChange", 1.e-3, "Stop iteration if largest change of any X is smaller than this"};
103+
Configurable<double> minRelChi2Change{"minRelChi2Change", 0.9, "Stop iteration if Chi2/Chi2old > this"};
104+
Configurable<double> maxChi2{"maxChi2", 1e9, "Discard vertices with Chi2/Nprongs > this(or sum {DCAi^2}/Nprongs for abs. distance minimization)"};
105+
Configurable<bool> useAbsDCA{"useAbsDCA", true, "Minimise abs. distance rather than chi2"};
106+
Configurable<bool> useWeightedFinalPCA{"useWeightedFinalPCA", false, "Recalculate vertex position using track covariance, effective only if useAbsDCA is true"};
107+
Configurable<bool> refitWithMaterialCorrection{"refitWithMaterialCorrection", false, "Do refit after material correction applied"};
107108
// Options for internal V0 building
108109
// ...Initial values taken from PWGLF/Utiles/strangenessBuilderModule.h
109110
// ...Modified according to the configurable in core wagon
110-
Configurable<int> minCrossedRowsFromLF{"minCrossedRowsFromLF", 50, "minimun TPC crossed rows for daughter tracks. Used for internal V0 Building"};
111-
Configurable<float> dcanegtopvFromLF{"dcanegtopvFromLF", .1, "DCV Neg to PV"};
112-
Configurable<float> dcapostopvFromLF{"dcapostopvFromLF", .1, "DCV Pos To PV"};
113-
Configurable<double> v0cospaFromLF{"v0cospaFromLF", 0.95, "V0 CosPA"};
114-
Configurable<float> dcav0dauFromLF{"dcav0dauFromLF", 1.0, "DCA V0 Daughters"};
115-
Configurable<float> v0radiusFromLF{"v0radiusFromLF", 0.9, "v0radius"};
116-
Configurable<float> maxDaughterEtaFromLF{"maxDaughterEtaFromLF", 5.0, "Maximun daughter eta (in abs value)"};
111+
Configurable<int> minCrossedRows{"minCrossedRows", 50, "minimun TPC crossed rows for daughter tracks. Used for internal V0 Building"};
112+
Configurable<float> dcanegtopv{"dcanegtopv", .1, "DCV Neg to PV"};
113+
Configurable<float> dcapostopv{"dcapostopv", .1, "DCV Pos To PV"};
114+
Configurable<double> v0cospa{"v0cospa", 0.95, "V0 CosPA"};
115+
Configurable<float> dcav0dau{"dcav0dau", 1.0, "DCA V0 Daughters"};
116+
Configurable<float> v0radius{"v0radius", 0.9, "v0radius"};
117+
Configurable<float> maxDaughterEta{"maxDaughterEta", 5.0, "Maximun daughter eta (in abs value)"};
117118
// Options for internal cascade building
118119
// ...Initial values taken from PWGLF/Utiles/strangenessBuilderModule.h
119120
// ...Modified according to the configurable in core wagon
120-
Configurable<float> dcabachtopvFromLF{"dcabachtopvFromLF", .05, "DCV Bach to PV"};
121-
Configurable<float> cascradiusFromLF{"cascradiusFromLF", .9, "DCV Bach to PV"};
122-
Configurable<float> casccospaFromLF{"casccospaFromLF", 0.95, "Cascade CosPA"};
123-
Configurable<float> dcacascdauFromLF{"dcacascdauFromLF", 1.0, "DCA cascade daughters"};
124-
Configurable<float> lambdaMassWindowFromLF{"lambdaMassWindowFromLF", 0.01, "Distance from Lambda mass(does not apply to KF path)"};
121+
Configurable<float> dcabachtopv{"dcabachtopv", .05, "DCV Bach to PV"};
122+
Configurable<float> cascradius{"cascradius", .9, "DCV Bach to PV"};
123+
Configurable<float> casccospa{"casccospa", 0.95, "Cascade CosPA"};
124+
Configurable<float> dcacascdau{"dcacascdau", 1.0, "DCA cascade daughters"};
125+
Configurable<float> lambdaMassWindow{"lambdaMassWindow", 0.01, "Distance from Lambda mass(does not apply to KF path)"};
125126
// Options for internal cascade building - KF Building specifics
126127
// ...Initial values taken from PWGLF/Utiles/strangenessBuilderModule.h
127-
Configurable<bool> kfTuneForOmegaFromLF{"kfTuneForOmegaFromLF", false, "if enabled, take main cascade properties from omega fit instread of Xi fit(=default)"};
128-
Configurable<int> kfConstructMethodFromLF{"kfConstructMethodFromLF", 2, "2 : Daughter particle masses stay fixed in construction process"};
129-
Configurable<bool> kfUseV0MassConstraintFromLF{"kfUseV0MassConstraintFromLF", true, "KF : Use Lambda mass constraint"};
130-
Configurable<bool> kfUseCascadeMassConstraintFromLF{"kfUseCascadeMassConstraintFromLF", false, "KF : Use Cascade mass constraint - WARNING : Not adequate for inv mass analysis of Xi"};
131-
Configurable<bool> kfDoDCAFitterPreMinimV0FromLF{"kfDoDCAFitterPreMinimV0FromLF", true, "KF : do DCAFitter pre-optimization before KF fit to include material correction for V0"};
132-
Configurable<bool> kfDoDCAFitterPreMinimCascFromLF{"kfDoDCAFitterPreMinimCascFromLF", false, "KF : do DCAFitter pre-optimization before KF fit to include material correction for Xi"};
133-
} LFConfigs;
128+
Configurable<bool> kfTuneForOmega{"kfTuneForOmega", false, "if enabled, take main cascade properties from omega fit instread of Xi fit(=default)"};
129+
Configurable<int> kfConstructMethod{"kfConstructMethod", 2, "2 : Daughter particle masses stay fixed in construction process"};
130+
Configurable<bool> kfUseV0MassConstraint{"kfUseV0MassConstraint", true, "KF : Use Lambda mass constraint"};
131+
Configurable<bool> kfUseCascadeMassConstraint{"kfUseCascadeMassConstraint", false, "KF : Use Cascade mass constraint - WARNING : Not adequate for inv mass analysis of Xi"};
132+
Configurable<bool> kfDoDCAFitterPreMinimV0{"kfDoDCAFitterPreMinimV0", true, "KF : do DCAFitter pre-optimization before KF fit to include material correction for V0"};
133+
Configurable<bool> kfDoDCAFitterPreMinimCasc{"kfDoDCAFitterPreMinimCasc", false, "KF : do DCAFitter pre-optimization before KF fit to include material correction for Xi"};
134+
} lfConfigs;
134135

135136
struct : ConfigurableGroup {
136137
// Switch for filling histograms
@@ -295,34 +296,34 @@ struct HfCandidateCreatorXic0Omegac0Qa {
295296

296297
// Initilization for strangeness builder helper
297298
// Settings for internal V0 building
298-
straHelper.v0selections.minCrossedRows = LFConfigs.minCrossedRowsFromLF;
299-
straHelper.v0selections.dcanegtopv = LFConfigs.dcanegtopvFromLF;
300-
straHelper.v0selections.dcapostopv = LFConfigs.dcapostopvFromLF;
301-
straHelper.v0selections.v0cospa = LFConfigs.v0cospaFromLF;
302-
straHelper.v0selections.dcav0dau = LFConfigs.dcav0dauFromLF;
303-
straHelper.v0selections.v0radius = LFConfigs.v0radiusFromLF;
304-
straHelper.v0selections.maxDaughterEta = LFConfigs.maxDaughterEtaFromLF;
299+
straHelper.v0selections.minCrossedRows = lfConfigs.minCrossedRows;
300+
straHelper.v0selections.dcanegtopv = lfConfigs.dcanegtopv;
301+
straHelper.v0selections.dcapostopv = lfConfigs.dcapostopv;
302+
straHelper.v0selections.v0cospa = lfConfigs.v0cospa;
303+
straHelper.v0selections.dcav0dau = lfConfigs.dcav0dau;
304+
straHelper.v0selections.v0radius = lfConfigs.v0radius;
305+
straHelper.v0selections.maxDaughterEta = lfConfigs.maxDaughterEta;
305306

306307
// Settings for internal Cascade building
307-
straHelper.cascadeselections.minCrossedRows = LFConfigs.minCrossedRowsFromLF;
308-
straHelper.cascadeselections.dcabachtopv = LFConfigs.dcabachtopvFromLF;
309-
straHelper.cascadeselections.cascradius = LFConfigs.cascradiusFromLF;
310-
straHelper.cascadeselections.casccospa = LFConfigs.casccospaFromLF;
311-
straHelper.cascadeselections.dcacascdau = LFConfigs.dcacascdauFromLF;
312-
straHelper.cascadeselections.lambdaMassWindow = LFConfigs.lambdaMassWindowFromLF;
313-
straHelper.cascadeselections.maxDaughterEta = LFConfigs.maxDaughterEtaFromLF;
308+
straHelper.cascadeselections.minCrossedRows = lfConfigs.minCrossedRows;
309+
straHelper.cascadeselections.dcabachtopv = lfConfigs.dcabachtopv;
310+
straHelper.cascadeselections.cascradius = lfConfigs.cascradius;
311+
straHelper.cascadeselections.casccospa = lfConfigs.casccospa;
312+
straHelper.cascadeselections.dcacascdau = lfConfigs.dcacascdau;
313+
straHelper.cascadeselections.lambdaMassWindow = lfConfigs.lambdaMassWindow;
314+
straHelper.cascadeselections.maxDaughterEta = lfConfigs.maxDaughterEta;
314315

315316
// Fitter setting
316-
straHelper.fitter.setPropagateToPCA(LFConfigs.propagateToPCALF);
317-
straHelper.fitter.setMaxR(LFConfigs.maxRLF);
318-
straHelper.fitter.setMaxDZIni(LFConfigs.maxDZIniLF);
319-
straHelper.fitter.setMaxDXYIni(LFConfigs.maxDXYIniLF);
320-
straHelper.fitter.setMinParamChange(LFConfigs.minParamChangeLF);
321-
straHelper.fitter.setMinRelChi2Change(LFConfigs.minRelChi2ChangeLF);
322-
straHelper.fitter.setMaxChi2(LFConfigs.maxChi2LF);
323-
straHelper.fitter.setUseAbsDCA(LFConfigs.useAbsDCALF);
324-
straHelper.fitter.setWeightedFinalPCA(LFConfigs.useWeightedFinalPCALF);
325-
straHelper.fitter.setRefitWithMatCorr(LFConfigs.refitWithMaterialCorrectionLF);
317+
straHelper.fitter.setPropagateToPCA(lfConfigs.propagateToPCA);
318+
straHelper.fitter.setMaxR(lfConfigs.maxR);
319+
straHelper.fitter.setMaxDZIni(lfConfigs.maxDZIni);
320+
straHelper.fitter.setMaxDXYIni(lfConfigs.maxDXYIni);
321+
straHelper.fitter.setMinParamChange(lfConfigs.minParamChange);
322+
straHelper.fitter.setMinRelChi2Change(lfConfigs.minRelChi2Change);
323+
straHelper.fitter.setMaxChi2(lfConfigs.maxChi2);
324+
straHelper.fitter.setUseAbsDCA(lfConfigs.useAbsDCA);
325+
straHelper.fitter.setWeightedFinalPCA(lfConfigs.useWeightedFinalPCA);
326+
straHelper.fitter.setRefitWithMatCorr(lfConfigs.refitWithMaterialCorrection);
326327

327328
// Extra initialization for DCAFitter
328329
if (nProcessesDCA == 1) {
@@ -631,12 +632,12 @@ struct HfCandidateCreatorXic0Omegac0Qa {
631632
negTrack,
632633
bachTrack,
633634
false, // calculateBachelorBaryonVariables
634-
LFConfigs.kfConstructMethodFromLF,
635-
LFConfigs.kfTuneForOmegaFromLF,
636-
LFConfigs.kfUseV0MassConstraintFromLF,
637-
LFConfigs.kfUseCascadeMassConstraintFromLF,
638-
LFConfigs.kfDoDCAFitterPreMinimV0FromLF,
639-
LFConfigs.kfDoDCAFitterPreMinimCascFromLF)) {
635+
lfConfigs.kfConstructMethod,
636+
lfConfigs.kfTuneForOmega,
637+
lfConfigs.kfUseV0MassConstraint,
638+
lfConfigs.kfUseCascadeMassConstraint,
639+
lfConfigs.kfDoDCAFitterPreMinimV0,
640+
lfConfigs.kfDoDCAFitterPreMinimCasc)) {
640641
return;
641642
} else {
642643
float storeMass = (decayChannel == 0) ? straHelper.cascade.massXi : straHelper.cascade.massOmega;

0 commit comments

Comments
 (0)