Skip to content

Commit 2d879c8

Browse files
author
Michael Carrigan
committed
cleaned up code
1 parent 35ba83a commit 2d879c8

6 files changed

Lines changed: 55 additions & 19 deletions

File tree

‎fcl/reco/Definitions/stage1_icarus_defs.fcl‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,27 @@ icarus_stage1_producers.SBNShowerGausCryoW.UseAllParticles:
396396
icarus_stage1_producers.SBNShowerGausCryoE.PFParticleLabel: "pandoraGausCryoE"
397397
icarus_stage1_producers.SBNShowerGausCryoE.UseAllParticles: true
398398

399+
applyNorm: true
400+
401+
icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[7].CalorimetryAlg: @local::icarus_calorimetryalgdata
402+
icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[7].ApplyCorrectionsInNorm: @local::applyNorm
403+
icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[7].NormTools: @local::icarus_calonormtools
404+
icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[7].CalorimetryAlg: @local::icarus_calorimetryalgdata
405+
icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[7].ApplyCorrectionsInNorm: @local::applyNorm
406+
icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[7].NormTools: @local::icarus_calonormtools
407+
408+
icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[5].CalorimetryAlg: @local::icarus_calorimetryalgdata
409+
icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[5].ApplyCorrectionsInNorm: @local::applyNorm
410+
icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[5].NormTools: @local::icarus_calonormtools
411+
icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[5].CalorimetryAlg: @local::icarus_calorimetryalgdata
412+
icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[5].ApplyCorrectionsInNorm: @local::applyNorm
413+
icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[5].NormTools: @local::icarus_calonormtools
414+
415+
icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyCorrectionsInNorm: @local::applyNorm
416+
icarus_stage1_producers.SBNShowerGausCryoE.ShowerFinderTools[3].NormTools: @local::icarus_calonormtools
417+
icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyCorrectionsInNorm: @local::applyNorm
418+
icarus_stage1_producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools: @local::icarus_calonormtools
419+
399420
# Set supera input fcl files
400421
icarus_stage1_analyzers.superaMC.supera_params: "supera_icarus_MC_all_cryo_PMT_CRT_v10.fcl"
401422

‎fcl/reco/Stage1/mc/stage1_run2_icarus_MC.fcl‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,39 @@ physics.producers.mcreco.MCParticleDroppedLabel: "largeant:droppedMCParticles"
105105
physics.producers.mcreco.MCRecoPart.SavePathPDGList: [13,-13,211,-211,111,311,310,130,321,-321,2212,2112,2224,2214,2114,1114,3122,1000010020,1000010030,1000020030,1000020040]
106106
physics.producers.mcreco.MCRecoPart.TrackIDOffsets: [0,10000000,20000000] #Account for track ID offsets in labeling primaries
107107

108+
runPeriod: 2
109+
110+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].CalorimetryAlg: @local::icarus_calorimetryalgmc
111+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].ApplyCorrectionsInNorm: true
112+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].NormTools: @local::icarus_calonormtoolsMC
113+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].NormTools[0].MC: @local::runPeriod
114+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[7].NormTools[1].MC: @local::runPeriod
115+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].CalorimetryAlg: @local::icarus_calorimetryalgmc
116+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].ApplyCorrectionsInNorm: true
117+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].NormTools: @local::icarus_calonormtoolsMC
118+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].NormTools[0].MC: @local::runPeriod
119+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[7].NormTools[1].MC: @local::runPeriod
120+
121+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].CalorimetryAlg: @local::icarus_calorimetryalgmc
122+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].ApplyCorrectionsInNorm: true
123+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].NormTools: @local::icarus_calonormtoolsMC
124+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].NormTools[0].MC: @local::runPeriod
125+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[5].NormTools[1].MC: @local::runPeriod
126+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].CalorimetryAlg: @local::icarus_calorimetryalgmc
127+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].ApplyCorrectionsInNorm: true
128+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].NormTools: @local::icarus_calonormtoolsMC
129+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].NormTools[0].MC: @local::runPeriod
130+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[5].NormTools[1].MC: @local::runPeriod
131+
132+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].ApplyCorrectionsInNorm: true
133+
physics.producers.SBNShowerGausCryoE.ShowerFinderTools[3].NormTools: @local::icarus_calonormtoolsMC
134+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools[0].MC: @local::runPeriod
135+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools[1].MC: @local::runPeriod
136+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].ApplyCorrectionsInNorm: true
137+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools: @local::icarus_calonormtoolsMC
138+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools[0].MC: @local::runPeriod
139+
physics.producers.SBNShowerGausCryoW.ShowerFinderTools[3].NormTools[1].MC: @local::runPeriod
140+
108141
services.message.destinations :
109142
{
110143
STDCOUT:

‎icaruscode/TPC/Calorimetry/NormalizeDriftSQLite_tool.cc‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,8 @@ double icarus::calo::NormalizeDriftSQLite::Normalize(double dQdx, const art::Eve
142142
// Get the hit time
143143
double thit = fClockData->TPCTick2TrigTime(hit.PeakTime()) - t0;
144144

145-
//std::cout << "TPC Tick2TrigTime: " << fClockData->TPCTick2TrigTime(hit.PeakTime()) << ", t0: " << t0 << ", hit: " << hit.PeakTime() << std::endl;
146-
147145
if (fVerbose) std::cout << "NormalizeDriftSQLite Tool -- Norm factor: " << exp(thit / thiselifetime) << " at TPC: " << tpc << " Cryo: " << cryo << " Time: " << thit << " Track T0: " << t0 << std::endl;
148146

149-
//std::cout << "dQdx before: " << dQdx << ", dQdx after: " << dQdx*exp(thit / thiselifetime) << ", thit: " << thit << ", lifetime: " << thiselifetime << std::endl;
150147
// Scale
151148
if (thiselifetime > 0) {
152149
dQdx = dQdx*exp(thit / thiselifetime);

‎icaruscode/TPC/Calorimetry/NormalizeTPCPerPlaneSQL_tool.cc‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ void icarus::calo::NormalizeTPCPerPlaneSQL::configure(const fhicl::ParameterSet&
7373

7474
icarus::calo::NormalizeTPCPerPlaneSQL::ScaleInfo icarus::calo::NormalizeTPCPerPlaneSQL::GetScaleInfo(uint64_t run) {
7575

76-
//std::cout << "NormalizeTPCSQL Tool -- Getting scale info for run: " << run << std::endl;
77-
7876
// check the cache
7977
if (fScaleInfos.count(run)) {
8078
return fScaleInfos.at(run);
@@ -104,8 +102,6 @@ icarus::calo::NormalizeTPCPerPlaneSQL::ScaleInfo icarus::calo::NormalizeTPCPerPl
104102
double icarus::calo::NormalizeTPCPerPlaneSQL::Normalize(double dQdx, const art::Event &e,
105103
const recob::Hit &hit, const geo::Point_t &location, const geo::Vector_t &direction, double t0) {
106104

107-
//std::cout << "NormalizeTPCSQL Tool -- MC Flag: " << fMC << " Run: " << e.id().runID().run() << ", Subrun: " << e.id().subRunID().run() << std::endl;
108-
109105
// Get the info
110106
uint64_t runID = -1;
111107
switch (fMC) {
@@ -121,9 +117,6 @@ double icarus::calo::NormalizeTPCPerPlaneSQL::Normalize(double dQdx, const art::
121117
case 4:
122118
runID = 12960;
123119
break;
124-
case 5:
125-
runID = 5;
126-
break;
127120
default:
128121
runID = e.id().runID().run();
129122
break;

‎icaruscode/TPC/Calorimetry/NormalizeYZSQL_tool.cc‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ void icarus::calo::NormalizeYZSQL::configure(const fhicl::ParameterSet& pset) {}
163163

164164
const icarus::calo::NormalizeYZSQL::ScaleInfo& icarus::calo::NormalizeYZSQL::GetScaleInfo(uint64_t run) {
165165

166-
//std::cout << "NormalizeYZSQL Tool -- Getting scale info for run: " << run << std::endl;
167-
168166
// check the cache
169167
if (fScaleInfos.count(run)) {
170168
return fScaleInfos.at(run);
@@ -234,8 +232,6 @@ const icarus::calo::NormalizeYZSQL::ScaleInfo& icarus::calo::NormalizeYZSQL::Get
234232
double icarus::calo::NormalizeYZSQL::Normalize(double dQdx, const art::Event &e,
235233
const recob::Hit &hit, const geo::Point_t &location, const geo::Vector_t &direction, double t0) {
236234

237-
//std::cout << "NormalizeYZSQL Tool -- MC Flag: " << fMC << " Run: " << e.id().runID().run() << ", Subrun: " << e.id().subRunID().run() << std::endl;
238-
239235
// Get the info
240236
uint64_t runID = -1;
241237
switch (fMC) {
@@ -251,9 +247,6 @@ double icarus::calo::NormalizeYZSQL::Normalize(double dQdx, const art::Event &e,
251247
case 4:
252248
runID = 12960;
253249
break;
254-
case 5:
255-
runID = 5;
256-
break;
257250
default:
258251
runID = e.id().runID().run();
259252
break;

‎icaruscode/TPC/Calorimetry/normtools_icarus.fcl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ driftnorm_sql: {
3434
tool_type: NormalizeDriftSQLite
3535
DBFileName: tpc_elifetime_data
3636
DBTag: @local::ICARUS_Calibration_GlobalTags.tpc_elifetime_data
37-
Verbose: true
37+
Verbose: false
3838
}
3939

4040
tpcgain_sql: {
@@ -60,7 +60,6 @@ yznorm_sql: {
6060
MC: -1
6161
}
6262

63-
#icarus_calonormtools: [@local::driftnorm, @local::yznorm, @local::tpcgain]
6463
icarus_calonormtools: [@local::driftnorm_sql, @local::yznorm_sql, @local::tpcgain_sql]
6564
icarus_calonormtoolsMC: [@local::yznorm_sql, @local::tpcgain_sql]
6665

0 commit comments

Comments
 (0)