Skip to content

Commit e72aa4f

Browse files
committed
refactor(Base): Deduplicate code into FairModule::RegisterSensitiveVolume()
* Improve maintainability
1 parent fbc4fe6 commit e72aa4f

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

fairroot/base/sim/FairModule.cxx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,14 @@ void FairModule::SetGeometryFileName(TString fname, TString)
200200
fgeoName = "";
201201
}
202202

203+
void FairModule::RegisterSensitiveVolume(FairVolume& vol)
204+
{
205+
vol.setModId(fModId);
206+
vol.SetModule(this);
207+
fAllSensitiveVolumes.push_back(&vol);
208+
++fNbOfSensitiveVol;
209+
}
210+
203211
void FairModule::ProcessNodes(TList* nodes)
204212
{
205213
if (FairMCApplicationState::kConstructGeometry != FairMCApplication::Instance()->GetState()) {
@@ -242,10 +250,7 @@ void FairModule::ProcessNodes(TList* nodes)
242250
}
243251

244252
if (node->isSensitive() && fActive) {
245-
addedVol->setModId(fModId);
246-
addedVol->SetModule(this);
247-
fAllSensitiveVolumes.push_back(addedVol);
248-
++fNbOfSensitiveVol;
253+
RegisterSensitiveVolume(*addedVol);
249254
parNodes->AddLast(node);
250255
}
251256
}
@@ -261,10 +266,7 @@ void FairModule::AddSensitiveVolume(TGeoVolume* vol)
261266
return;
262267
}
263268
++fNbOfVolumes;
264-
addedVol->setModId(fModId);
265-
addedVol->SetModule(this);
266-
fAllSensitiveVolumes.push_back(addedVol);
267-
++fNbOfSensitiveVol;
269+
RegisterSensitiveVolume(*addedVol);
268270
}
269271

270272
FairVolume* FairModule::getFairVolume(FairGeoNode* fN)

fairroot/base/sim/FairModule.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ class FairModule : public TNamed
158158
void ReAssignMediaId();
159159
void swap(FairModule& other) throw();
160160

161+
void RegisterSensitiveVolume(FairVolume&);
162+
161163
protected:
162164
FairModule(const FairModule&);
163165
FairModule& operator=(const FairModule&);

0 commit comments

Comments
 (0)