Skip to content

Commit 3998806

Browse files
vkuceravkucera
committed
Update configuration
1 parent 525ea3b commit 3998806

File tree

3 files changed

+101
-53
lines changed

3 files changed

+101
-53
lines changed

‎codeHF/config_tasks.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,13 @@ function AdjustJson {
192192
if [ "$INPUT_RUN" -eq 2 ]; then
193193
ReplaceString "\"processRun2\": \"false\"" "\"processRun2\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
194194
ReplaceString "\"processRun3\": \"true\"" "\"processRun3\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
195+
ReplaceString "\"processRun2\": \"0\"" "\"processRun2\": \"1\"" "$JSON" || ErrExit "Failed to edit $JSON."
196+
ReplaceString "\"processRun3\": \"1\"" "\"processRun3\": \"0\"" "$JSON" || ErrExit "Failed to edit $JSON."
195197
elif [ "$INPUT_RUN" -eq 3 ]; then
196198
ReplaceString "\"processRun2\": \"true\"" "\"processRun2\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
197199
ReplaceString "\"processRun3\": \"false\"" "\"processRun3\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
200+
ReplaceString "\"processRun2\": \"1\"" "\"processRun2\": \"0\"" "$JSON" || ErrExit "Failed to edit $JSON."
201+
ReplaceString "\"processRun3\": \"0\"" "\"processRun3\": \"1\"" "$JSON" || ErrExit "Failed to edit $JSON."
198202
fi
199203

200204
# MC
@@ -206,6 +210,7 @@ function AdjustJson {
206210
ReplaceString "\"processMcWithDCAFitterAll\": \"false\"" "\"processMcWithDCAFitterAll\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
207211
ReplaceString "\"processMcWithDCAFitterN\": \"false\"" "\"processMcWithDCAFitterN\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
208212
ReplaceString "\"processMC\": \"false\"" "\"processMC\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
213+
ReplaceString "\"processMC\": \"0\"" "\"processMC\": \"1\"" "$JSON" || ErrExit "Failed to edit $JSON."
209214
ReplaceString "\"processData\": \"true\"" "\"processData\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
210215
ReplaceString "\"processDataStd\": \"true\"" "\"processDataStd\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
211216
ReplaceString "\"processDataWithDCAFitterN\": \"true\"" "\"processDataWithDCAFitterN\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
@@ -217,6 +222,7 @@ function AdjustJson {
217222
ReplaceString "\"processMcWithDCAFitterAll\": \"true\"" "\"processMcWithDCAFitterAll\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
218223
ReplaceString "\"processMcWithDCAFitterN\": \"true\"" "\"processMcWithDCAFitterN\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
219224
ReplaceString "\"processMC\": \"true\"" "\"processMC\": \"false\"" "$JSON" || ErrExit "Failed to edit $JSON."
225+
ReplaceString "\"processMC\": \"1\"" "\"processMC\": \"0\"" "$JSON" || ErrExit "Failed to edit $JSON."
220226
ReplaceString "\"processData\": \"false\"" "\"processData\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
221227
ReplaceString "\"processDataStd\": \"false\"" "\"processDataStd\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."
222228
ReplaceString "\"processDataWithDCAFitterN\": \"false\"" "\"processDataWithDCAFitterN\": \"true\"" "$JSON" || ErrExit "Failed to edit $JSON."

‎codeHF/dpl-config_run3.json‎

Lines changed: 85 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
"centralityMax": "100",
2020
"useSel8Trigger": "true",
2121
"triggerClass": "-1",
22+
"useTvxTrigger": "true",
2223
"useTimeFrameBorderCut": "true",
24+
"useItsRofBorderCut": "true",
2325
"useIsGoodZvtxFT0vsPV": "false",
2426
"useNoSameBunchPileup": "false",
2527
"useNumTracksInTimeRange": "false",
@@ -28,7 +30,10 @@
2830
"nPvContributorsMin": "0",
2931
"chi2PvMax": "-1",
3032
"zPvPosMin": "-10",
31-
"zPvPosMax": "10"
33+
"zPvPosMax": "10",
34+
"softwareTrigger": "",
35+
"bcMarginForSoftwareTrigger": "100",
36+
"ccdbPathSoftwareTrigger": "Users/m/mpuccio/EventFiltering/OTS/"
3237
},
3338
"processTrigAndCentFT0ASel": "false",
3439
"processTrigAndCentFT0CSel": "false",
@@ -791,18 +796,14 @@
791796
"hf-track-index-skim-creator-cascades": {
792797
"isRun2": "true",
793798
"fillHistograms": "true",
799+
"useDCAFitter": "true",
794800
"propagateToPCA": "true",
795801
"maxR": "200",
796802
"maxDZIni": "4",
797803
"minParamChange": "0.001",
798804
"minRelChi2Change": "0.9",
799805
"useAbsDCA": "true",
800806
"useWeightedFinalPCA": "false",
801-
"doCutQuality": "true",
802-
"tpcRefitBach": "false",
803-
"nCrossedRowsMinBach": "50",
804-
"tpcRefitV0Daugh": "false",
805-
"nCrossedRowsMinV0Daugh": "50",
806807
"etaMinV0Daugh": "-99999",
807808
"etaMaxV0Daugh": "1.1",
808809
"ptMinV0Daugh": "0.05",
@@ -2380,6 +2381,38 @@
23802381
},
23812382
"timestampCCDB": "-1",
23822383
"loadModelsFromCCDB": "false",
2384+
"useTriggerMassCut": "false",
2385+
"hfTrigger2ProngCuts": {
2386+
"nSigmaMax": "2",
2387+
"ptDeltaMassMax": "10",
2388+
"ptMassCutMax": "9999",
2389+
"deltaMassPars": {
2390+
"labels_rows": "",
2391+
"labels_cols": [
2392+
"constant",
2393+
"linear"
2394+
],
2395+
"values": [
2396+
[
2397+
"-0.0025",
2398+
"9.99999975e-05"
2399+
]
2400+
]
2401+
},
2402+
"sigmaPars": {
2403+
"labels_rows": "",
2404+
"labels_cols": [
2405+
"constant",
2406+
"linear"
2407+
],
2408+
"values": [
2409+
[
2410+
"0.0142400004",
2411+
"0.00178000005"
2412+
]
2413+
]
2414+
}
2415+
},
23832416
"processWithDCAFitterN": "true",
23842417
"processWithKFParticle": "false"
23852418
},
@@ -5876,6 +5909,13 @@
58765909
"1"
58775910
]
58785911
},
5912+
"thnConfigAxisPromptScore": {
5913+
"values": [
5914+
"50",
5915+
"0",
5916+
"1"
5917+
]
5918+
},
58795919
"thnConfigAxisMass": {
58805920
"values": [
58815921
"120",
@@ -6182,11 +6222,11 @@
61826222
"20"
61836223
]
61846224
},
6185-
"thnConfigAxisMultiplicity": {
6225+
"thnConfigAxisCentrality": {
61866226
"values": [
61876227
"100",
61886228
"0",
6189-
"1000"
6229+
"100"
61906230
]
61916231
},
61926232
"thnConfigAxisChi2PCA": {
@@ -6233,8 +6273,16 @@
62336273
},
62346274
"processDataStd": "true",
62356275
"processDataWithMl": "false",
6276+
"processDataStdWithFT0C": "false",
6277+
"processDataWithMlWithFT0C": "false",
6278+
"processDataStdWithFT0M": "false",
6279+
"processDataWithMlWithFT0M": "false",
62366280
"processMcStd": "false",
6237-
"processMcWithMl": "false"
6281+
"processMcWithMl": "false",
6282+
"processMcStdWithFT0C": "false",
6283+
"processMcWithMlWithFT0C": "false",
6284+
"processMcStdWithFT0M": "false",
6285+
"processMcWithMlWithFT0M": "false"
62386286
},
62396287
"hf-task-lc-to-k0s-p": {
62406288
"selectionFlagLcToK0sP": "0",
@@ -7308,80 +7356,67 @@
73087356
"processRun3FT0": "false"
73097357
},
73107358
"multiplicity-table": {
7311-
"doVertexZeq": "1",
7312-
"fractionOfEvents": "2",
7359+
"processRun3": "0",
7360+
"processRun2": "1",
73137361
"enabledTables": {
7314-
"labels_rows": [
7315-
"FV0Mults",
7316-
"FT0Mults",
7317-
"FDDMults",
7318-
"ZDCMults",
7319-
"TrackletMults",
7320-
"TPCMults",
7321-
"PVMults",
7322-
"MultsExtra",
7323-
"MultSelections",
7324-
"FV0MultZeqs",
7325-
"FT0MultZeqs",
7326-
"FDDMultZeqs",
7327-
"PVMultZeqs",
7328-
"MultsExtraMC"
7329-
],
7330-
"labels_cols": [
7331-
"Enable"
7332-
],
73337362
"values": [
73347363
[
7335-
"-1"
7364+
-1
73367365
],
73377366
[
7338-
"-1"
7367+
-1
73397368
],
73407369
[
7341-
"-1"
7370+
-1
73427371
],
73437372
[
7344-
"-1"
7373+
-1
73457374
],
73467375
[
7347-
"-1"
7376+
-1
73487377
],
73497378
[
7350-
"-1"
7379+
-1
73517380
],
73527381
[
7353-
"-1"
7382+
-1
73547383
],
73557384
[
7356-
"-1"
7385+
-1
73577386
],
73587387
[
7359-
"-1"
7388+
-1
73607389
],
73617390
[
7362-
"-1"
7391+
-1
73637392
],
73647393
[
7365-
"-1"
7394+
-1
73667395
],
73677396
[
7368-
"-1"
7397+
-1
73697398
],
73707399
[
7371-
"-1"
7400+
-1
73727401
],
73737402
[
7374-
"-1"
7403+
-1
73757404
]
73767405
]
73777406
},
7378-
"ccdburl": "http://alice-ccdb.cern.ch",
7407+
"fractionOfEvents": "2",
7408+
"processMC2Mults": "0",
7409+
"min_pt_globaltrack": "0.15",
7410+
"min_ncluster_its_globaltrack": "5",
7411+
"max_pt_globaltrack": "1e+10",
7412+
"processGlobalTrackingCounters": "0",
7413+
"min_ncluster_itsib_globaltrack": "1",
7414+
"doVertexZeq": "1",
7415+
"produceHistograms": "0",
7416+
"reconstructionPass": " ",
73797417
"ccdbpath": "Centrality/Calibration",
7380-
"produceHistograms": "false",
7381-
"processRun2": "true",
7382-
"processRun3": "false",
7383-
"processGlobalTrackingCounters": "false",
7384-
"processMC": "true"
7418+
"ccdburl": "http://alice-ccdb.cern.ch",
7419+
"processMC": "1"
73857420
},
73867421
"pid-multiplicity": {
73877422
"processIU": "false",

‎codeHF/workflows.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,14 @@ workflows:
6060

6161
o2-analysis-hf-candidate-creator-2prong: &cand_creator_2p
6262
executable: o2-analysis-hf-candidate-creator-2prong
63-
dependencies: o2-analysis-hf-track-index-skim-creator_skimX
63+
dependencies:
64+
- o2-analysis-hf-track-index-skim-creator_skimX
65+
- o2-analysis-track-dca_runX
66+
- o2-analysis-event-selection
67+
- o2-analysis-hf-pid-creator
68+
- o2-analysis-pid-tof-full_runX
69+
- o2-analysis-pid-tpc
70+
6471
tables:
6572
default: [HFCAND2PBASE, DYN/HFCAND2PEXT]
6673
mc: [HFCAND2PMCREC, HFCAND2PMCGEN]
@@ -70,8 +77,8 @@ workflows:
7077
dependencies: o2-analysis-track-dca_runX
7178

7279
o2-analysis-hf-candidate-creator-3prong: &cand_creator_3p
80+
<<: *cand_creator_2p
7381
executable: o2-analysis-hf-candidate-creator-3prong
74-
dependencies: o2-analysis-hf-track-index-skim-creator_skimX
7582
tables:
7683
default: [HFCAND3PBASE, DYN/HFCAND3PEXT]
7784
mc: [HFCAND3PMCREC, HFCAND3PMCGEN]
@@ -81,8 +88,8 @@ workflows:
8188
dependencies: o2-analysis-track-dca_runX
8289

8390
o2-analysis-hf-candidate-creator-dstar: &cand_creator_dstar
91+
<<: *cand_creator_2p
8492
executable: o2-analysis-hf-candidate-creator-dstar
85-
dependencies: o2-analysis-hf-track-index-skim-creator_skimX
8693
tables:
8794
default: [HFDSTARCANDBASE, DYN/HFDSTAREXT, HFD0FROMDSTAR, DYN/HFD0FRMDSTREXT]
8895
mc: [HFDSTARMCREC, HFDSTARMCGEN]

0 commit comments

Comments
 (0)