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

Jump to bottom

Reduce memory churn at Geant4 initialisation of geometry #27519

Merged
merged 2 commits into from Jul 15, 2019
Merged

Reduce memory churn at Geant4 initialisation of geometry #27519

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
4fda742
reduce memory churn at initialisation
civanch Jul 14, 2019
6105757
code format
civanch Jul 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions SimG4Core/Geometry/interface/DDDWorld.h
View file
Open in desktop
@@ -1,8 +1,9 @@
#ifndef SimG4Core_DDDWorld_h
#define SimG4Core_DDDWorld_h

#include "SimG4Core/Geometry/interface/G4LogicalVolumeToDDLogicalPartMap.h"
#include "SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h"
#include "G4VPhysicalVolume.hh"
#include "SimG4Core/Geometry/interface/DDGeometryReturnType.h"
#include "DDG4/Geant4GeometryInfo.h"

class DDG4Builder;
Expand All @@ -14,7 +15,7 @@ namespace cms {

class DDDWorld {
public:
DDDWorld(const DDCompactView *, G4LogicalVolumeToDDLogicalPartMap &, SensitiveDetectorCatalog &, bool check = false);
DDDWorld(const DDCompactView *, G4LogicalVolumeToDDLogicalPartMap &, SensitiveDetectorCatalog &, bool check);
DDDWorld(const cms::DDDetector *, dd4hep::sim::Geant4GeometryMaps::VolumeMap &);
~DDDWorld();
G4VPhysicalVolume *GetWorldVolume() const { return m_world; }
Expand Down
18 changes: 8 additions & 10 deletions SimG4Core/Geometry/interface/DDG4Builder.h
View file
Open in desktop
@@ -1,8 +1,8 @@
#ifndef SimG4Core_DDG4Builder_h
#define SimG4Core_DDG4Builder_h

#include "SimG4Core/Geometry/interface/DDGeometryReturnType.h"
#include "SimG4Core/Notification/interface/DDG4DispContainer.h"
#include "SimG4Core/Geometry/interface/G4LogicalVolumeToDDLogicalPartMap.h"

#include "DetectorDescription/Core/interface/DDLogicalPart.h"
#include "DetectorDescription/Core/interface/DDMaterial.h"
Expand All @@ -18,31 +18,29 @@ class G4VPhysicalVolume;
class G4Material;
class G4VSolid;
class DDCompactView;
class SensitiveDetectorCatalog;

class DDG4Builder {
public:
DDG4Builder(const DDCompactView *, bool check = false);
DDG4Builder(const DDCompactView *, G4LogicalVolumeToDDLogicalPartMap &, bool check);
~DDG4Builder();
DDGeometryReturnType BuildGeometry();
static DDG4DispContainer *theVectorOfDDG4Dispatchables();
G4LogicalVolume *BuildGeometry(SensitiveDetectorCatalog &);

protected:
private:
G4VSolid *convertSolid(const DDSolid &dSolid);
G4LogicalVolume *convertLV(const DDLogicalPart &dLogical);
G4Material *convertMaterial(const DDMaterial &dMaterial);
int getInt(const std::string &s, const DDLogicalPart &dLogical);
double getDouble(const std::string &s, const DDLogicalPart &dLogical);

protected:
DDG4SolidConverter *solidConverter_;
std::map<DDMaterial, G4Material *> mats_;
std::map<DDSolid, G4VSolid *> sols_;
std::map<DDLogicalPart, G4LogicalVolume *> logs_;

private:
const DDCompactView *compactView;
static DDG4DispContainer *theVectorOfDDG4Dispatchables_;
G4LogicalVolumeToDDLogicalPartMap map_;
const DDCompactView *compactView_;
G4LogicalVolumeToDDLogicalPartMap &map_;
DDG4DispContainer *theVectorOfDDG4Dispatchables_;
bool check_;
};

Expand Down
7 changes: 4 additions & 3 deletions SimG4Core/Geometry/interface/DDG4SensitiveConverter.h
View file
Open in desktop
@@ -1,19 +1,20 @@
#ifndef SimG4Core_DDG4SensitiveConverter_h
#define SimG4Core_DDG4SensitiveConverter_h

#include "DetectorDescription/Core/interface/DDLogicalPart.h"
#include "SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h"
#include "SimG4Core/Notification/interface/DDG4DispContainer.h"

#include <iostream>
#include <string>
#include <vector>

class SensitiveDetectorCatalog;
class DDLogicalPart;

class DDG4SensitiveConverter {
public:
DDG4SensitiveConverter();
virtual ~DDG4SensitiveConverter();
SensitiveDetectorCatalog upDate(const DDG4DispContainer &ddg4s);
void upDate(const DDG4DispContainer &ddg4s, SensitiveDetectorCatalog &);

private:
std::string getString(const std::string &, const DDLogicalPart *);
Expand Down
9 changes: 3 additions & 6 deletions SimG4Core/Geometry/src/DDDWorld.cc
View file
Open in desktop
Expand Up @@ -17,18 +17,15 @@ using namespace dd4hep;
using namespace dd4hep::sim;

DDDWorld::DDDWorld(const DDCompactView *cpv,
G4LogicalVolumeToDDLogicalPartMap &map,
G4LogicalVolumeToDDLogicalPartMap &lvmap,
SensitiveDetectorCatalog &catalog,
bool check) {
LogVerbatim("SimG4CoreApplication") << "DDDWorld: initialization of Geant4 geometry";
std::unique_ptr<DDG4Builder> theBuilder(new DDG4Builder(cpv, check));
std::unique_ptr<DDG4Builder> theBuilder(new DDG4Builder(cpv, lvmap, check));

DDGeometryReturnType ret = theBuilder->BuildGeometry();
G4LogicalVolume *world = ret.logicalVolume();
G4LogicalVolume *world = theBuilder->BuildGeometry(catalog);

m_world = new G4PVPlacement(nullptr, G4ThreeVector(), world, "DDDWorld", nullptr, false, 0);
map = ret.lvToDDLPMap();
catalog = ret.sdCatalog();
LogVerbatim("SimG4CoreApplication") << "DDDWorld: initialization of Geant4 geometry is done.";
}

Expand Down
29 changes: 11 additions & 18 deletions SimG4Core/Geometry/src/DDG4Builder.cc
View file
Open in desktop
@@ -1,20 +1,17 @@
#include "DetectorDescription/Core/interface/DDSpecifics.h"

#include "FWCore/Utilities/interface/Exception.h"

#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "SimG4Core/Geometry/interface/DDG4Builder.h"
#include "SimG4Core/Geometry/interface/DDG4SensitiveConverter.h"
#include "SimG4Core/Geometry/interface/DDG4SolidConverter.h"
#include "SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h"

#include "DetectorDescription/Core/interface/DDCompactView.h"
#include "DetectorDescription/Core/interface/DDSpecifics.h"

#include "G4Box.hh"
#include "G4Cons.hh"
#include "G4LogicalVolume.hh"
#include "G4Material.hh"
#include "G4PVPlacement.hh"
#include "G4ReflectionFactory.hh"
#include "G4Trap.hh"
#include "G4Tubs.hh"
#include "G4VPhysicalVolume.hh"
#include "G4VSolid.hh"

Expand All @@ -25,12 +22,8 @@

#include "FWCore/MessageLogger/interface/MessageLogger.h"

DDG4DispContainer *DDG4Builder::theVectorOfDDG4Dispatchables_ = nullptr;

DDG4DispContainer *DDG4Builder::theVectorOfDDG4Dispatchables() { return theVectorOfDDG4Dispatchables_; }

DDG4Builder::DDG4Builder(const DDCompactView *cpv, bool check)
: solidConverter_(new DDG4SolidConverter), compactView(cpv), check_(check) {
DDG4Builder::DDG4Builder(const DDCompactView *cpv, G4LogicalVolumeToDDLogicalPartMap &lvmap, bool check)
: solidConverter_(new DDG4SolidConverter), compactView_(cpv), map_(lvmap), check_(check) {
theVectorOfDDG4Dispatchables_ = new DDG4DispContainer();
}

Expand Down Expand Up @@ -104,12 +97,12 @@ G4Material *DDG4Builder::convertMaterial(const DDMaterial &material) {
return result;
}

DDGeometryReturnType DDG4Builder::BuildGeometry() {
G4LogicalVolume *DDG4Builder::BuildGeometry(SensitiveDetectorCatalog &catalog) {
G4ReflectionFactory *refFact = G4ReflectionFactory::Instance();
refFact->SetScalePrecision(100. * refFact->GetScalePrecision());

using Graph = DDCompactView::Graph;
const auto &gra = compactView->graph();
const auto &gra = compactView_->graph();
using adjl_iterator = Graph::const_adj_iterator;
adjl_iterator git = gra.begin();
adjl_iterator gend = gra.end();
Expand Down Expand Up @@ -188,15 +181,15 @@ DDGeometryReturnType DDG4Builder::BuildGeometry() {
}
}

G4LogicalVolume *world = logs_[compactView->root()];
G4LogicalVolume *world = logs_[compactView_->root()];

//
// needed for building sensitive detectors
//
DDG4SensitiveConverter conv_;
SensitiveDetectorCatalog catalog = conv_.upDate(*theVectorOfDDG4Dispatchables_);
conv_.upDate(*theVectorOfDDG4Dispatchables_, catalog);

return DDGeometryReturnType(world, map_, catalog);
return world;
}

int DDG4Builder::getInt(const std::string &ss, const DDLogicalPart &part) {
Expand Down
7 changes: 4 additions & 3 deletions SimG4Core/Geometry/src/DDG4SensitiveConverter.cc
View file
Open in desktop
@@ -1,4 +1,7 @@
#include "SimG4Core/Geometry/interface/DDG4SensitiveConverter.h"
#include "SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h"

#include "DetectorDescription/Core/interface/DDLogicalPart.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/Utilities/interface/Exception.h"
Expand All @@ -9,9 +12,8 @@ DDG4SensitiveConverter::DDG4SensitiveConverter() {}

DDG4SensitiveConverter::~DDG4SensitiveConverter() {}

SensitiveDetectorCatalog DDG4SensitiveConverter::upDate(const DDG4DispContainer &ddg4s) {
void DDG4SensitiveConverter::upDate(const DDG4DispContainer &ddg4s, SensitiveDetectorCatalog &catalog) {
LogDebug("SimG4CoreGeometry") << " DDG4SensitiveConverter::upDate() starts";
SensitiveDetectorCatalog catalog;

for (auto ddg4 : ddg4s) {
const DDLogicalPart *part = (ddg4->getDDLogicalPart());
Expand All @@ -27,7 +29,6 @@ SensitiveDetectorCatalog DDG4SensitiveConverter::upDate(const DDG4DispContainer
catalog.insert(sClassName, sROUName, fff);
}
}
return catalog;
}

std::string DDG4SensitiveConverter::getString(const std::string &ss, const DDLogicalPart *part) {
Expand Down