Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
zdcLG
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Chad Lantz
zdcLG
Commits
358a87bb
Commit
358a87bb
authored
2 years ago
by
Chad Lantz
Browse files
Options
Downloads
Patches
Plain Diff
Removed GDML dependencies
parent
f6877285
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/DetectorConstruction.hh
+2
-2
2 additions, 2 deletions
include/DetectorConstruction.hh
src/DetectorConstruction.cc
+17
-15
17 additions, 15 deletions
src/DetectorConstruction.cc
with
19 additions
and
17 deletions
include/DetectorConstruction.hh
+
2
−
2
View file @
358a87bb
...
...
@@ -38,7 +38,7 @@
#include
"G4LogicalVolume.hh"
#include
"G4VUserDetectorConstruction.hh"
#include
"G4SubtractionSolid.hh"
#include
"G4GDMLParser.hh"
//
#include "G4GDMLParser.hh"
#include
"G4RunManager.hh"
#include
"Materials.hh"
...
...
@@ -115,7 +115,7 @@ class DetectorConstruction : public G4VUserDetectorConstruction
G4Material
*
m_filler
;
G4MaterialPropertiesTable
*
m_GasMPT
;
G4GDMLParser
m_Parser
;
//
G4GDMLParser m_Parser;
G4RunManager
*
m_runMan
;
DetectorMessenger
*
m_DetectorMessenger
;
};
...
...
This diff is collapsed.
Click to expand it.
src/DetectorConstruction.cc
+
17
−
15
View file @
358a87bb
...
...
@@ -59,7 +59,7 @@
#include
"G4VisExtent.hh"
#include
"G4Colour.hh"
#include
"G4UImanager.hh"
#include
"G4GDMLParser.hh"
//
#include "G4GDMLParser.hh"
/*
*
...
...
@@ -503,12 +503,12 @@ void DetectorConstruction::UseCADModel(G4String fileName){
"LightGuide"
);
//name
}
if
(
fileType
==
"gdml"
){
m_Parser
.
Read
(
fileName
);
}
if
(
fileType
==
"step"
){
m_logicLightGuide
=
m_Parser
.
ParseST
(
fileName
,
materials
->
Air
,
materials
->
Al
);
}
//
if(fileType == "gdml"){
//
m_Parser.Read(fileName);
//
}
//
if(fileType == "step"){
//
m_logicLightGuide = m_Parser.ParseST(fileName,materials->Air,materials->Al);
//
}
if
(
m_logicLightGuide
!=
0
){
...
...
@@ -544,15 +544,17 @@ void DetectorConstruction::UseCADModel(G4String fileName){
* Output the model of the light guide to GDML
*/
void
DetectorConstruction
::
OutputToGDML
(
G4String
fileName
){
if
(
m_physLightGuide
[
0
]
!=
0
){
G4cout
<<
"Go home, you're drunk"
<<
G4endl
;
// if(m_physLightGuide[0] != 0){
//For some reason this only works as a pointer
G4GDMLParser
*
gdml
=
new
G4GDMLParser
();
gdml
->
Write
(
fileName
.
c_str
(),
m_physLightGuide
.
back
());
delete
gdml
;
}
else
{
G4cout
<<
"No physical light guide defined..."
<<
G4endl
;
G4cout
<<
"Can't write model to GDML"
<<
G4endl
;
}
//
G4GDMLParser* gdml = new G4GDMLParser();
//
gdml->Write(fileName.c_str(),m_physLightGuide.back());
//
delete gdml;
//
}else{
//
G4cout << "No physical light guide defined..." << G4endl;
//
G4cout << "Can't write model to GDML" << G4endl;
//
}
}
/*
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment