Skip to content

Commit c78dc10

Browse files
fjnicolasfjnicolas
authored
Merge pull request #451 from SBNSoftware/feature/bearc_mcreco_rearrange
Run mcreco with Dropped Particles
2 parents 82367fe + 95c7701 commit c78dc10

12 files changed

Lines changed: 60 additions & 33 deletions

‎sbndcode/JobConfigurations/base/reco_sbnd.fcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ physics:
256256
crtskim: @local::crtskim_sbnd
257257
pmtskim: @local::pmtskim_sbnd
258258
supera: @local::sbnd_supera
259+
superampvmpr: @local::sbnd_supera_mpvmpr
259260
}
260261

261262
caloskimana: [ caloskim, crtskim, pmtskim ]

‎sbndcode/JobConfigurations/standard/g4/g4_dirt_filter.fcl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22

33
#include "standard_g4_sbnd.fcl"
44

5+
# Set proper input tags for mcreco
6+
physics.producers.mcreco.MCParticleDroppedLabel: "largeantdropped"
7+
58
physics.simulate: [ rns
69
, sedlite #SEDLite reduces info from SED
710
, ionandscint
811
, ionandscintout
912
, pdfastsim
1013
, pdfastsimout
1114
# , simdrift ## 1D TPC simulation no longer run
12-
#, mcreco ## mcreco now run after WireCell sim
15+
, mcreco
1316
, genericcrt
1417
]
1518

‎sbndcode/JobConfigurations/standard/g4/g4_enterstpc_filter.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ physics.simulate: [ rns
1313
, pdfastsimout
1414
# , simdrift #1D drift sim no longer run
1515
, filter # Adding filter
16-
# , mcreco #mc reco added to detsim
16+
, mcreco
1717
]
1818

1919

‎sbndcode/JobConfigurations/standard/g4/g4_mu_crt_filter_base.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ physics.simulate: [ rns
1414
, pdfastsimout
1515
# , simdrift #1D drift sim no longer run
1616
, filter # Adding filter
17-
# , mcreco #mc reco added to detsim
17+
, mcreco
1818
, genericcrt
1919
]
2020

‎sbndcode/JobConfigurations/standard/g4/g4_sce_simphotontime_filter.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ physics.simulate: [ rns
3737
, pdfastsimout
3838
, genericcrt
3939
### Do truth-level reconstruction
40-
# , mcreco
40+
, mcreco
4141
]

‎sbndcode/JobConfigurations/standard/g4/g4_simphotontime_filter.fcl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ physics.producers.largeantdropped.InputSourcesLabels: [ "larg4intime:droppedMCPa
8181
# Change simple merge inputs since we're using an overlay sample
8282
physics.producers.simplemerge.InputSourcesLabels: ["largeant", "largeantdropped"]
8383

84+
# Set proper input tags for mcreco
85+
physics.producers.mcreco.MCParticleDroppedLabel: "largeantdropped"
86+
8487
# Add all these new modules to the simulate path
8588
physics.simulate: [ rns
8689
### Complete intime drift simulation and generic CRT
@@ -109,7 +112,7 @@ physics.simulate: [ rns
109112
, pdfastsimout
110113
, genericcrt
111114
### Do truth-level reconstruction
112-
# , mcreco
115+
, mcreco
113116
]
114117

115118
services.ParticleListAction.keepGenTrajectories: ["GenInTimeSorter"]

‎sbndcode/JobConfigurations/standard/gen/MultiPart/multipartvertex_sbnd.fcl‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,59 @@ BEGIN_PROLOG
33
MultiPartVertex : {
44
module_type : "MultiPartVertex"
55
DebugMode : 0
6-
G4Time : 340.8
7-
G4TimeJitter : 1.6
6+
G4Time : 819.2 # [ns]
7+
G4TimeJitter : 1.6 # [ns]
88
TPCRange : [[0,0],[0,1]]
99
XRange : [30,30]
1010
YRange : [30,30]
1111
ZRange : [30,30]
12-
MultiMax : 6
12+
MultiMax : 7
1313
MultiMin : 2
14+
GammaBetaRange : [0.0, 3.0]
15+
Revert : 0
16+
UseBoost : 0
1417
ParticleParameter: {
15-
PDGCode : [ [-11,11,-13,13], [111], [211,-211], [2212]]
16-
MinMulti : [ 1, 0, 0, 0]
17-
MaxMulti : [ 1, 2, 2, 4]
18-
ProbWeight : [ 3, 1, 1, 3]
19-
KERange : [ [0.05,0.8], [0.05,0.4], [0.05,0.4], [0.05,0.4]]
18+
PDGCode : [ [-11,11,-13,13], [111], [211,-211], [2212], [22]]
19+
MinMulti : [ 0, 0, 0, 0, 0]
20+
MaxMulti : [ 1, 2, 2, 4, 2]
21+
ProbWeight : [ 3, 1, 1, 3, 1]
22+
KERange : [ [0.0,3.0], [0.0,1.0], [0.0,1.0], [0.0,1.0], [0.0,1.0]]
2023
MomRange : []
2124
}
2225
}
2326

2427
MultiPartRain : {
2528
module_type : "MultiPartRain"
2629
DebugMode : 0
27-
G4Time : 819.2 # [us]
28-
G4TimeJitter : 1638.4 # [us]
30+
G4Time : 819.2 # [ns]
31+
G4TimeJitter : 1638.4 # [ns]
2932
TPCRange : [[0,0],[0,1]]
3033
XRange : [20,20]
3134
YRange : [20,20]
3235
ZRange : [20,20]
33-
MultiMax : 15
34-
MultiMin : 8
36+
DirectInward : true
37+
CosmicDistribution : false
38+
MultiMax : 5
39+
MultiMin : 3
3540
ParticleParameter: {
36-
PDGCode : [ [-13,13], [11,22], [2212]]
37-
MinMulti : [ 0, 0, 0]
38-
MaxMulti : [ 15, 5, 15]
39-
ProbWeight : [ 5, 1, 1]
40-
KERange : [ [0.05,1.0], [0.05,0.1], [0.05,0.4]]
41+
PDGCode : [ [-13,13], [-13,13], [11,-11], [22], [2212]]
42+
MinMulti : [ 0, 0, 0, 0, 0]
43+
MaxMulti : [ 5, 5, 2, 3, 5]
44+
ProbWeight : [ 5, 5, 1, 2, 1]
45+
KERange : [ [0.0,20.0], [0.0,2.0], [0.0,1.0], [0.0,1.0], [0.0,1.0]]
4146
MomRange : []
4247
}
4348
}
4449

50+
MultiPartRain2 : @local::MultiPartRain
51+
MultiPartRain2.G4Time: -50000 # [ns]
52+
MultiPartRain2.G4TimeJitter: 2900000 # [ns]
53+
MultiPartRain2.MultiMax: 4
54+
MultiPartRain2.MultiMin: 2
55+
MultiPartRain2.ParticleParameter.PDGCode : [ [-13,13], [-13,13], [2212]]
56+
MultiPartRain2.ParticleParameter.MinMulti : [ 0, 0, 0]
57+
MultiPartRain2.ParticleParameter.MaxMulti : [ 5, 5, 5]
58+
MultiPartRain2.ParticleParameter.ProbWeight : [ 5, 5, 1]
59+
MultiPartRain2.ParticleParameter.KERange : [ [0.0,20.0], [0.0,2.0], [0.0,1.0]]
60+
4561
END_PROLOG

‎sbndcode/JobConfigurations/standard/gen/MultiPart/run_mpvmpr_sbnd.fcl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ physics:
3333
rns: { module_type: "RandomNumberSaver" }
3434
generator: @local::MultiPartVertex
3535
rain: @local::MultiPartRain
36+
rain2: @local::MultiPartRain2
3637
}
3738

38-
simulate: [ rns, generator, rain]
39+
simulate: [ rns, generator, rain, rain2]
3940
out_stream: [ out1 ]
4041

4142
trigger_paths: [simulate]

‎sbndcode/JobConfigurations/standard/reco/reco1_sce_mpvmpr_lite.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
#include "reco1_sce_lite.fcl"
66

7-
physics.analyzers.supera: @local::sbnd_supera_mpvmpr
7+
physics.superaana: [superampvmpr]

‎sbndcode/JobConfigurations/standard/standard_detsim_sbnd.fcl‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# - recob::Wire (TPC signals per channel)
1313
# - sim::SimChannel (Simulated electrons per channel)
1414
# - OpDetWaveforms (optical waveforms)
15-
# - MCReco -> MCTrack, MCShower: deposited energy from each MCParticle (needs SimChannels)
1615

1716
#
1817
# Dependencies:
@@ -33,7 +32,6 @@
3332
#include "wcsimsp_sbnd.fcl"
3433
#include "crtsimmodules_sbnd.fcl"
3534
#include "opdetdigitizer_sbnd.fcl"
36-
#include "mcreco_sbnd.fcl"
3735
#include "rootoutput_sbnd.fcl"
3836

3937

@@ -67,11 +65,10 @@ physics:
6765
simtpc2d: @local::sbnd_wcls_simsp
6866
crtsim: @local::sbnd_crtsim
6967
opdaq: @local::sbnd_opdetdigitizer
70-
mcreco: @local::sbnd_mcreco
7168
}
7269

7370
#define the producer and filter modules for this path, order matters,
74-
simulate: [rns, simtpc2d, crtsim, opdaq, mcreco]
71+
simulate: [rns, simtpc2d, crtsim, opdaq]
7572

7673
#define the output stream, there could be more than one if using filters
7774
stream1: [ out1 ]

0 commit comments

Comments
 (0)