Skip to content

Commit 5d02042

Browse files
aimeric-landouaimeric-landou
authored
codeJE - update workflow (#440)
1 parent 208b13d commit 5d02042

File tree

3 files changed

+10
-343
lines changed

3 files changed

+10
-343
lines changed

‎codeJE/config_tasks.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ MAKE_GRAPH=0 # Make topology graph.
3636
# Activation of O2 workflows
3737
# Table producers
3838
DOO2_JET_DERIVED=0 # je-jet-deriveddata-producer
39-
DOO2_JET_FINDER=0 # je-jet-finder
39+
DOO2_JET_FINDER=0 # je-jet-finder-data-charged
4040
# Analysis tasks
4141
# TODO: Add analysis tasks
4242
# QA
@@ -143,7 +143,7 @@ function MakeScriptO2 {
143143
WORKFLOWS=""
144144
# Table producers
145145
[ $DOO2_JET_DERIVED -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-deriveddata-producer"
146-
[ $DOO2_JET_FINDER -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder"
146+
[ $DOO2_JET_FINDER -eq 1 ] && WORKFLOWS+=" o2-analysis-je-jet-finder-data-charged"
147147
# Analysis tasks
148148
# TODO: Add analysis tasks
149149
# QA

‎codeJE/dpl-config.json‎

Lines changed: 6 additions & 339 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,17 @@
5656
"etaMax": "0.8"
5757
},
5858
"jet-deriveddata-producer": {
59-
"processBunchCossings": "true",
60-
"processCollisions": "true",
59+
"processBunchCrossings": "false",
60+
"processCollisions": "false",
61+
"processCollisionsWithoutCentralityAndMultiplicity": "true",
6162
"processMcCollisionLabels": "false",
6263
"processMcCollisions": "false",
6364
"processTracks": "true",
6465
"processMcTrackLabels": "false",
6566
"processParticles": "false",
66-
"processClusters": "false"
67+
"processClusters": "false",
68+
"processD0": "false",
69+
"processD0MC": "false"
6770
},
6871
"jet-finder-data-charged": {
6972
"vertexZCut": "10",
@@ -107,342 +110,6 @@
107110
"processParticleLevelNeutralJets": "false",
108111
"processParticleLevelFullJets": "false"
109112
},
110-
"jet-finder-data-full": {
111-
"vertexZCut": "10",
112-
"trackPtMin": "0.15",
113-
"trackPtMax": "1000",
114-
"trackEtaMin": "-0.8",
115-
"trackEtaMax": "0.8",
116-
"trackPhiMin": "-999",
117-
"trackPhiMax": "999",
118-
"trackSelections": "globalTracks",
119-
"eventSelections": "sel7",
120-
"particleSelections": "PhysicalPrimary",
121-
"clusterDefinition": "kV3Default",
122-
"clusterEtaMin": "-0.7",
123-
"clusterEtaMax": "0.7",
124-
"clusterPhiMin": "-999",
125-
"clusterPhiMax": "999",
126-
"clusterEnergyMin": "0.5",
127-
"clusterTimeMin": "-999",
128-
"clusterTimeMax": "999",
129-
"clusterRejectExotics": "true",
130-
"jetRadius": {
131-
"values": [
132-
"0.4"
133-
]
134-
},
135-
"jetPtMin": "0",
136-
"jetPtMax": "1000",
137-
"jetEtaMin": "-99",
138-
"jetEtaMax": "99",
139-
"jetAlgorithm": "2",
140-
"jetRecombScheme": "0",
141-
"jetGhostArea": "0.005",
142-
"ghostRepeat": "1",
143-
"DoTriggering": "false",
144-
"processDummy": "true",
145-
"processChargedJets": "false",
146-
"processNeutralJets": "false",
147-
"processFullJets": "false",
148-
"processParticleLevelChargedJets": "false",
149-
"processParticleLevelNeutralJets": "false",
150-
"processParticleLevelFullJets": "false"
151-
},
152-
"jet-finder-data-neutral": {
153-
"vertexZCut": "10",
154-
"trackPtMin": "0.15",
155-
"trackPtMax": "1000",
156-
"trackEtaMin": "-0.8",
157-
"trackEtaMax": "0.8",
158-
"trackPhiMin": "-999",
159-
"trackPhiMax": "999",
160-
"trackSelections": "globalTracks",
161-
"eventSelections": "sel8",
162-
"particleSelections": "PhysicalPrimary",
163-
"clusterDefinition": "kV3Default",
164-
"clusterEtaMin": "-0.7",
165-
"clusterEtaMax": "0.7",
166-
"clusterPhiMin": "-999",
167-
"clusterPhiMax": "999",
168-
"clusterEnergyMin": "0.5",
169-
"clusterTimeMin": "-999",
170-
"clusterTimeMax": "999",
171-
"clusterRejectExotics": "true",
172-
"jetRadius": {
173-
"values": [
174-
"0.4"
175-
]
176-
},
177-
"jetPtMin": "0",
178-
"jetPtMax": "1000",
179-
"jetEtaMin": "-99",
180-
"jetEtaMax": "99",
181-
"jetAlgorithm": "2",
182-
"jetRecombScheme": "0",
183-
"jetGhostArea": "0.005",
184-
"ghostRepeat": "1",
185-
"DoTriggering": "false",
186-
"processDummy": "true",
187-
"processChargedJets": "false",
188-
"processNeutralJets": "false",
189-
"processFullJets": "false",
190-
"processParticleLevelChargedJets": "false",
191-
"processParticleLevelNeutralJets": "false",
192-
"processParticleLevelFullJets": "false"
193-
},
194-
"jet-finder-mcd-charged": {
195-
"vertexZCut": "10",
196-
"trackPtMin": "0.15",
197-
"trackPtMax": "1000",
198-
"trackEtaMin": "-0.8",
199-
"trackEtaMax": "0.8",
200-
"trackPhiMin": "-999",
201-
"trackPhiMax": "999",
202-
"trackSelections": "globalTracks",
203-
"eventSelections": "sel8",
204-
"particleSelections": "PhysicalPrimary",
205-
"clusterDefinition": "kV3Default",
206-
"clusterEtaMin": "-0.7",
207-
"clusterEtaMax": "0.7",
208-
"clusterPhiMin": "-999",
209-
"clusterPhiMax": "999",
210-
"clusterEnergyMin": "0.5",
211-
"clusterTimeMin": "-999",
212-
"clusterTimeMax": "999",
213-
"clusterRejectExotics": "true",
214-
"jetRadius": {
215-
"values": [
216-
"0.4"
217-
]
218-
},
219-
"jetPtMin": "0",
220-
"jetPtMax": "1000",
221-
"jetEtaMin": "-99",
222-
"jetEtaMax": "99",
223-
"jetAlgorithm": "2",
224-
"jetRecombScheme": "0",
225-
"jetGhostArea": "0.005",
226-
"ghostRepeat": "1",
227-
"DoTriggering": "false",
228-
"processDummy": "true",
229-
"processChargedJets": "false",
230-
"processNeutralJets": "false",
231-
"processFullJets": "false",
232-
"processParticleLevelChargedJets": "false",
233-
"processParticleLevelNeutralJets": "false",
234-
"processParticleLevelFullJets": "false"
235-
},
236-
"jet-finder-mcd-full": {
237-
"vertexZCut": "10",
238-
"trackPtMin": "0.15",
239-
"trackPtMax": "1000",
240-
"trackEtaMin": "-0.8",
241-
"trackEtaMax": "0.8",
242-
"trackPhiMin": "-999",
243-
"trackPhiMax": "999",
244-
"trackSelections": "globalTracks",
245-
"eventSelections": "sel8",
246-
"particleSelections": "PhysicalPrimary",
247-
"clusterDefinition": "kV3Default",
248-
"clusterEtaMin": "-0.7",
249-
"clusterEtaMax": "0.7",
250-
"clusterPhiMin": "-999",
251-
"clusterPhiMax": "999",
252-
"clusterEnergyMin": "0.5",
253-
"clusterTimeMin": "-999",
254-
"clusterTimeMax": "999",
255-
"clusterRejectExotics": "true",
256-
"jetRadius": {
257-
"values": [
258-
"0.4"
259-
]
260-
},
261-
"jetPtMin": "0",
262-
"jetPtMax": "1000",
263-
"jetEtaMin": "-99",
264-
"jetEtaMax": "99",
265-
"jetAlgorithm": "2",
266-
"jetRecombScheme": "0",
267-
"jetGhostArea": "0.005",
268-
"ghostRepeat": "1",
269-
"DoTriggering": "false",
270-
"processDummy": "true",
271-
"processChargedJets": "false",
272-
"processNeutralJets": "false",
273-
"processFullJets": "false",
274-
"processParticleLevelChargedJets": "false",
275-
"processParticleLevelNeutralJets": "false",
276-
"processParticleLevelFullJets": "false"
277-
},
278-
"jet-finder-mcd-neutral": {
279-
"vertexZCut": "10",
280-
"trackPtMin": "0.15",
281-
"trackPtMax": "1000",
282-
"trackEtaMin": "-0.8",
283-
"trackEtaMax": "0.8",
284-
"trackPhiMin": "-999",
285-
"trackPhiMax": "999",
286-
"trackSelections": "globalTracks",
287-
"eventSelections": "sel8",
288-
"particleSelections": "PhysicalPrimary",
289-
"clusterDefinition": "kV3Default",
290-
"clusterEtaMin": "-0.7",
291-
"clusterEtaMax": "0.7",
292-
"clusterPhiMin": "-999",
293-
"clusterPhiMax": "999",
294-
"clusterEnergyMin": "0.5",
295-
"clusterTimeMin": "-999",
296-
"clusterTimeMax": "999",
297-
"clusterRejectExotics": "true",
298-
"jetRadius": {
299-
"values": [
300-
"0.4"
301-
]
302-
},
303-
"jetPtMin": "0",
304-
"jetPtMax": "1000",
305-
"jetEtaMin": "-99",
306-
"jetEtaMax": "99",
307-
"jetAlgorithm": "2",
308-
"jetRecombScheme": "0",
309-
"jetGhostArea": "0.005",
310-
"ghostRepeat": "1",
311-
"DoTriggering": "false",
312-
"processDummy": "true",
313-
"processChargedJets": "false",
314-
"processNeutralJets": "false",
315-
"processFullJets": "false",
316-
"processParticleLevelChargedJets": "false",
317-
"processParticleLevelNeutralJets": "false",
318-
"processParticleLevelFullJets": "false"
319-
},
320-
"jet-finder-mcp-charged": {
321-
"vertexZCut": "10",
322-
"trackPtMin": "0.15",
323-
"trackPtMax": "1000",
324-
"trackEtaMin": "-0.8",
325-
"trackEtaMax": "0.8",
326-
"trackPhiMin": "-999",
327-
"trackPhiMax": "999",
328-
"trackSelections": "globalTracks",
329-
"eventSelections": "sel8",
330-
"particleSelections": "PhysicalPrimary",
331-
"clusterDefinition": "kV3Default",
332-
"clusterEtaMin": "-0.7",
333-
"clusterEtaMax": "0.7",
334-
"clusterPhiMin": "-999",
335-
"clusterPhiMax": "999",
336-
"clusterEnergyMin": "0.5",
337-
"clusterTimeMin": "-999",
338-
"clusterTimeMax": "999",
339-
"clusterRejectExotics": "true",
340-
"jetRadius": {
341-
"values": [
342-
"0.4"
343-
]
344-
},
345-
"jetPtMin": "0",
346-
"jetPtMax": "1000",
347-
"jetEtaMin": "-99",
348-
"jetEtaMax": "99",
349-
"jetAlgorithm": "2",
350-
"jetRecombScheme": "0",
351-
"jetGhostArea": "0.005",
352-
"ghostRepeat": "1",
353-
"DoTriggering": "false",
354-
"processDummy": "true",
355-
"processChargedJets": "false",
356-
"processNeutralJets": "false",
357-
"processFullJets": "false",
358-
"processParticleLevelChargedJets": "false",
359-
"processParticleLevelNeutralJets": "false",
360-
"processParticleLevelFullJets": "false"
361-
},
362-
"jet-finder-mcp-full": {
363-
"vertexZCut": "10",
364-
"trackPtMin": "0.15",
365-
"trackPtMax": "1000",
366-
"trackEtaMin": "-0.8",
367-
"trackEtaMax": "0.8",
368-
"trackPhiMin": "-999",
369-
"trackPhiMax": "999",
370-
"trackSelections": "globalTracks",
371-
"eventSelections": "sel8",
372-
"particleSelections": "PhysicalPrimary",
373-
"clusterDefinition": "kV3Default",
374-
"clusterEtaMin": "-0.7",
375-
"clusterEtaMax": "0.7",
376-
"clusterPhiMin": "-999",
377-
"clusterPhiMax": "999",
378-
"clusterEnergyMin": "0.5",
379-
"clusterTimeMin": "-999",
380-
"clusterTimeMax": "999",
381-
"clusterRejectExotics": "true",
382-
"jetRadius": {
383-
"values": [
384-
"0.4"
385-
]
386-
},
387-
"jetPtMin": "0",
388-
"jetPtMax": "1000",
389-
"jetEtaMin": "-99",
390-
"jetEtaMax": "99",
391-
"jetAlgorithm": "2",
392-
"jetRecombScheme": "0",
393-
"jetGhostArea": "0.005",
394-
"ghostRepeat": "1",
395-
"DoTriggering": "false",
396-
"processDummy": "true",
397-
"processChargedJets": "false",
398-
"processNeutralJets": "false",
399-
"processFullJets": "false",
400-
"processParticleLevelChargedJets": "false",
401-
"processParticleLevelNeutralJets": "false",
402-
"processParticleLevelFullJets": "false"
403-
},
404-
"jet-finder-mcp-neutral": {
405-
"vertexZCut": "10",
406-
"trackPtMin": "0.15",
407-
"trackPtMax": "1000",
408-
"trackEtaMin": "-0.8",
409-
"trackEtaMax": "0.8",
410-
"trackPhiMin": "-999",
411-
"trackPhiMax": "999",
412-
"trackSelections": "globalTracks",
413-
"eventSelections": "sel8",
414-
"particleSelections": "PhysicalPrimary",
415-
"clusterDefinition": "kV3Default",
416-
"clusterEtaMin": "-0.7",
417-
"clusterEtaMax": "0.7",
418-
"clusterPhiMin": "-999",
419-
"clusterPhiMax": "999",
420-
"clusterEnergyMin": "0.5",
421-
"clusterTimeMin": "-999",
422-
"clusterTimeMax": "999",
423-
"clusterRejectExotics": "true",
424-
"jetRadius": {
425-
"values": [
426-
"0.4"
427-
]
428-
},
429-
"jetPtMin": "0",
430-
"jetPtMax": "1000",
431-
"jetEtaMin": "-99",
432-
"jetEtaMax": "99",
433-
"jetAlgorithm": "2",
434-
"jetRecombScheme": "0",
435-
"jetGhostArea": "0.005",
436-
"ghostRepeat": "1",
437-
"DoTriggering": "false",
438-
"processDummy": "true",
439-
"processChargedJets": "false",
440-
"processNeutralJets": "false",
441-
"processFullJets": "false",
442-
"processParticleLevelChargedJets": "false",
443-
"processParticleLevelNeutralJets": "false",
444-
"processParticleLevelFullJets": "false"
445-
},
446113
"jet-validation-track-collision-qa": {
447114
"ptLow": "0.15",
448115
"ptUp": "1e15",

‎codeJE/workflows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ workflows:
3434
o2-analysis-je-jet-deriveddata-producer:
3535
dependencies: [o2-analysis-je-emcal-correction-task]
3636

37-
o2-analysis-je-jet-finder:
37+
o2-analysis-je-jet-finder-data-charged:
3838
dependencies: [o2-analysis-je-jet-deriveddata-producer]
3939

4040
# Analysis tasks
@@ -44,7 +44,7 @@ workflows:
4444
# QA
4545

4646
o2-analysis-je-jet-validation-qa:
47-
dependencies: [o2-analysis-je-jet-finder, o2-analysis-je-jet-deriveddata-producer, o2-analysis-trackselection_runX]
47+
dependencies: [o2-analysis-je-jet-finder-data-charged, o2-analysis-je-jet-deriveddata-producer, o2-analysis-trackselection_runX]
4848

4949
o2-analysis-qa-efficiency:
5050
requires_mc: yes

0 commit comments

Comments
 (0)