Skip to content

Commit 4664c72

Browse files
committed
Homogenize the names of input and output files in tests
1 parent 31c6f7a commit 4664c72

10 files changed

+17
-17
lines changed

test/k4FWCoreTest/options/CheckOutputFiles.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def check_collections(filename, names):
6363
"functional_transformer_multiple_output_commands.root",
6464
["VectorFloat", "MCParticles1", "MCParticles2", "SimTrackerHits", "TrackerHits"],
6565
)
66-
check_collections("/tmp/a/b/c/output_k4test_exampledata_producer.root", ["MCParticles"])
66+
check_collections("/tmp/a/b/c/functional_producer.root", ["MCParticles"])
6767
check_collections(
6868
"functional_transformer_runtime_empty.root",
6969
["MCParticles0", "MCParticles1", "MCParticles2"],
@@ -111,12 +111,12 @@ def check_collections(filename, names):
111111

112112
# Not working, collections produced by functional algorithms are not being written to the file
113113
# check_collections(
114-
# "output_k4test_exampledata_functional_mix.root",
114+
# "functional_mix.root",
115115
# mix_collections,
116116
# )
117117

118118
check_collections(
119-
"output_k4test_exampledata_functional_mix_iosvc.root",
119+
"functional_mix_iosvc.root",
120120
mix_collections,
121121
)
122122

test/k4FWCoreTest/options/ExampleFunctionalFile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from k4FWCore import ApplicationMgr, IOSvc
2727

2828
svc = IOSvc("IOSvc")
29-
svc.input = "output_k4test_exampledata_producer.root"
29+
svc.input = "functional_producer.root"
3030
svc.output = "functional_transformer.root"
3131

3232
transformer = ExampleFunctionalTransformer(

test/k4FWCoreTest/options/ExampleFunctionalFileMultiple.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from k4FWCore import ApplicationMgr, IOSvc
2727

2828
svc = IOSvc("IOSvc")
29-
svc.input = "output_k4test_exampledata_producer_multiple.root"
29+
svc.input = "functional_producer_multiple.root"
3030
svc.output = "functional_transformer_multiple.root"
3131

3232
transformer = ExampleFunctionalTransformerMultiple(

test/k4FWCoreTest/options/ExampleFunctionalMTFile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
scheduler = AvalancheSchedulerSvc(ThreadPoolSize=threads, ShowDataFlow=True, OutputLevel=WARNING)
4242

4343
svc = IOSvc("IOSvc")
44-
svc.input = "output_k4test_exampledata_producer_multiple.root"
44+
svc.input = "functional_producer_multiple.root"
4545
svc.output = "functional_transformerMT.root"
4646

4747
consumer = ExampleFunctionalConsumer(

test/k4FWCoreTest/options/ExampleFunctionalOutputCommands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from k4FWCore import ApplicationMgr, IOSvc
2626

2727
svc = IOSvc("IOSvc")
28-
svc.input = "output_k4test_exampledata_producer_multiple.root"
28+
svc.input = "functional_producer_multiple.root"
2929
svc.output = "functional_transformer_multiple_output_commands.root"
3030
svc.outputCommands = [
3131
"drop Tracks",

test/k4FWCoreTest/options/ExampleFunctionalProducer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030

3131
iosvc = IOSvc("IOSvc")
3232
name = (
33-
"output_k4test_exampledata_producer.root"
33+
"functional_producer.root"
3434
if not args[0].second
35-
else "output_k4test_exampledata_producer2.root"
35+
else "functional_producer2.root"
3636
)
3737
iosvc.output = name
3838
# Collections can be dropped

test/k4FWCoreTest/options/ExampleFunctionalProducerAbsolutePath.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from k4FWCore import ApplicationMgr, IOSvc
2727

2828
io = IOSvc("IOSvc")
29-
io.output = "/tmp/a/b/c/output_k4test_exampledata_producer.root"
29+
io.output = "/tmp/a/b/c/functional_producer.root"
3030

3131
producer = ExampleFunctionalProducer("ExampleFunctionalProducer")
3232

test/k4FWCoreTest/options/ExampleFunctionalProducerMultiple.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828

2929
iosvc = IOSvc("IOSvc")
30-
iosvc.output = "output_k4test_exampledata_producer_multiple.root"
30+
iosvc.output = "functional_producer_multiple.root"
3131
# Collections can be dropped
3232
# out.outputCommands = ["drop *"]
3333

test/k4FWCoreTest/options/ExampleFunctionalSeveralInputFiles.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
svc = IOSvc("IOSvc")
2828
svc.input = [
29-
"output_k4test_exampledata_producer.root",
30-
"output_k4test_exampledata_producer2.root",
29+
"functional_producer.root",
30+
"functional_producer2.root",
3131
]
3232

3333
consumer = ExampleFunctionalConsumer("Consumer", InputCollection=["MCParticles"], Offset=0)

test/k4FWCoreTest/options/runFunctionalMix.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
if not args.iosvc:
4949
podioevent = k4DataSvc("EventDataSvc")
50-
podioevent.input = "output_k4test_exampledata_producer_multiple.root"
50+
podioevent.input = "functional_producer_multiple.root"
5151

5252
inp = PodioInput()
5353
inp.collections = [
@@ -60,15 +60,15 @@
6060
]
6161

6262
out = PodioOutput()
63-
out.filename = "output_k4test_exampledata_functional_mix.root"
63+
out.filename = "functional_mix.root"
6464
out.outputCommands = ["keep *"]
6565

6666
else:
6767
from k4FWCore import IOSvc, ApplicationMgr
6868

6969
iosvc = IOSvc("IOSvc")
70-
iosvc.input = "output_k4test_exampledata_producer_multiple.root"
71-
iosvc.output = "output_k4test_exampledata_functional_mix_iosvc.root"
70+
iosvc.input = "functional_producer_multiple.root"
71+
iosvc.output = "functional_mix_iosvc.root"
7272

7373
# Check input with functional and old algorithms
7474

0 commit comments

Comments
 (0)