Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a comment and check for the status code of a test #137

Merged
merged 2 commits into from
Sep 5, 2023
Merged

Fix a comment and check for the status code of a test #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
202b00a
Fix a comment and check for the status code of a test
jmcarcell Sep 4, 2023
5054eed
Change LCGEO to K4GEO
jmcarcell Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/starterkit/k4MarlinWrapperCLIC/CEDViaWrapper.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ To create an input file for the event display we run a simple detector simulatio

```bash
ddsim --steeringFile CLICPerformance/clicConfig/clic_steer.py \
--compactFile $LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
--compactFile $K4GEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
--enableGun \
--gun.distribution uniform \
--gun.particle gamma \
Expand Down
10 changes: 5 additions & 5 deletions doc/starterkit/k4MarlinWrapperCLIC/Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ output in such format:
```bash
cd CLICPerformance/clicConfig

ddsim --compactFile $LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
ddsim --compactFile $K4GEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
--outputFile ttbar_edm4hep.root \
--steeringFile clic_steer.py \
--inputFiles ../Tests/yyxyev_000.stdhep \
Expand All @@ -61,7 +61,7 @@ in such format:
```bash
cd CLICPerformance/clicConfig

ddsim --compactFile $LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
ddsim --compactFile $K4GEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
--outputFile ttbar.slcio \
--steeringFile clic_steer.py \
--inputFiles ../Tests/yyxyev_000.stdhep \
Expand All @@ -79,7 +79,7 @@ To run the reconstruction with ``Marlin``:
cd CLICPerformance/clicConfig

Marlin clicReconstruction.xml \
--InitDD4hep.DD4hepXMLFile=$LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
--InitDD4hep.DD4hepXMLFile=$K4GEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
--global.LCIOInputFiles=ttbar.slcio \
--global.MaxRecordNumber=3
```
Expand Down Expand Up @@ -138,8 +138,8 @@ included with k4MarlinWrapper. Note that:
* Some *MarlinProcessorWrappers* may modify collections instead of producing new ones: the original EDM4hep collection wont be updated in this case and would need conversion from LCIO to EDM4hep.

- To run *clicReconstruction* with EDM4hep format, use the steering file found in the `examples` folder of k4MarlinWrapper:
`k4MarlinWrapper/examples/clicRec_e4h_input.py` (this also get's installed to `$K4MARLINWRAPPER/examples` in Key4hep releases)
+ Change line `evtsvc.input = '$TEST_DIR/inputFiles/ttbar_edm4hep_frame.root'` to point to the location of your input file.
`k4MarlinWrapper/examples/clicRec_e4h_input.py` (this also gets installed to `$K4MARLINWRAPPER/examples` in Key4hep releases)
+ Change the line where `evtsvc.input` is defined to point to the location of your input file.
+ At the bottom of the file, in the `ApplicationMgr` parameters, change `EvtMax = 3,` to the number of events to run.

This can be run in the following way. Note that we show the usage here in a way
Expand Down
2 changes: 1 addition & 1 deletion k4MarlinWrapper/examples/runit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
proc1.ProcessorType = "InitializeDD4hep"
proc1.Parameters = {#"EncodingStringParameter", "GlobalTrackerReadoutID"},
#"DD4hepXMLFile", "/cvmfs/clicdp.cern.ch/iLCSoft/builds/nightly/x86_64-slc6-gcc62-opt/lcgeo/HEAD/CLIC/compact/CLIC_o3_v13/CLIC_o3_v13.xml"},
"DD4hepXMLFile": [os.path.join(os.environ["LCGEO"], "CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml")],
"DD4hepXMLFile": [os.path.join(os.environ["K4GEO"], "CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml")],
}
algList.append(proc1)

Expand Down
2 changes: 1 addition & 1 deletion test/gaudi_opts/clicReconstruction_mt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
InitDD4hep.OutputLevel = WARNING
InitDD4hep.ProcessorType = "InitializeDD4hep"
InitDD4hep.Parameters = {
"DD4hepXMLFile": [os.environ["LCGEO"]+"/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml"],
"DD4hepXMLFile": [os.environ["K4GEO"]+"/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml"],
"EncodingStringParameter": ["GlobalTrackerReadoutID"]
}

Expand Down
3 changes: 2 additions & 1 deletion test/gaudi_opts/simple_processors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
proc1.OutputLevel = DEBUG
proc1.ProcessorType = "InitializeDD4hep"
proc1.Parameters = {#"EncodingStringParameter": ["GlobalTrackerReadoutID"],
"DD4hepXMLFile": [os.path.join(os.environ.get('LCGEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
"DD4hepXMLFile": [os.path.join(os.environ.get('K4GEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
}
algList.append(proc1)

Expand Down Expand Up @@ -84,3 +84,4 @@
ExtSvc = [evtsvc],
OutputLevel=DEBUG
)

2 changes: 1 addition & 1 deletion test/gaudi_opts/simple_processors2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
proc1.OutputLevel = DEBUG
proc1.ProcessorType = "InitializeDD4hep"
proc1.Parameters = {#"EncodingStringParameter": ["GlobalTrackerReadoutID"],
"DD4hepXMLFile": [os.path.join(os.environ.get('LCGEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
"DD4hepXMLFile": [os.path.join(os.environ.get('K4GEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
}
algList.append(proc1)

Expand Down
2 changes: 1 addition & 1 deletion test/gaudi_opts/simple_processors3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
proc1.OutputLevel = DEBUG
proc1.ProcessorType = "InitializeDD4hep"
proc1.Parameters = {#"EncodingStringParameter": ["GlobalTrackerReadoutID"],
"DD4hepXMLFile": [os.path.join(os.environ.get('LCGEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
"DD4hepXMLFile": [os.path.join(os.environ.get('K4GEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
}
algList.append(proc1)

Expand Down
4 changes: 1 addition & 3 deletions test/scripts/clicRec_e4h_input.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ if [ ! -f $TEST_DIR/inputFiles/$INPUTFILE ]; then
wget https://key4hep.web.cern.ch/testFiles/ddsimOutput/$INPUTFILE -P $TEST_DIR/inputFiles/
fi

# Frame based I/O exits with a user requested stop here, that makes Gaudi exit
# with an exit code of 4. See https://github.com/key4hep/k4FWCore/issues/125
k4run $EXAMPLE_DIR/clicRec_e4h_input.py || true
k4run $EXAMPLE_DIR/clicRec_e4h_input.py

input_num_events=$(python $TEST_DIR/python/root_num_events.py $TEST_DIR/inputFiles/$INPUTFILE)
output_num_events=$(python $TEST_DIR/python/root_num_events.py my_output.root)
Expand Down