From 6feaa84eb0403795077f583b1b955179f0ecb513 Mon Sep 17 00:00:00 2001
From: Frank Gaede <frank.gaede@desy.de>
Date: Fri, 26 Apr 2019 09:29:41 +0200
Subject: [PATCH] print correct endpoint in materialScan
---
UtilityApps/src/materialScan.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/UtilityApps/src/materialScan.cpp b/UtilityApps/src/materialScan.cpp
index 467ad1aec..ef293040e 100644
--- a/UtilityApps/src/materialScan.cpp
+++ b/UtilityApps/src/materialScan.cpp
@@ -54,7 +54,7 @@ int main_wrapper(int argc, char** argv) {
setPrintLevel(WARNING);
Detector& description = Detector::getInstance();
- description.fromCompact(inFile);
+ description.fromCompact(inFile,BUILD_ENVELOPE);
direction = (p1-p0).unit();
MaterialManager matMgr( description.world().volume() ) ;
@@ -83,7 +83,7 @@ int main_wrapper(int argc, char** argv) {
double nLambda = length / mat->GetIntLen();
sum_lambda += nLambda;
path_length += length;
- end = path_length * direction;
+ end = p0 + path_length * direction;
const char* fmt = mat->GetRadLen() >= 1e5 ? fmt2 : fmt1;
::printf(fmt, i+1, mat->GetName(), mat->GetZ(), mat->GetA(),
mat->GetDensity(), mat->GetRadLen(), mat->GetIntLen(),
@@ -93,7 +93,7 @@ int main_wrapper(int argc, char** argv) {
printf("%s",line);
const MaterialData& avg = matMgr.createAveragedMaterial(materials);
const char* fmt = avg.radiationLength() >= 1e5 ? fmt2 : fmt1;
- end = path_length * direction;
+ end = p0 + path_length * direction;
::printf(fmt,0,"Average Material",avg.Z(),avg.A(),avg.density(),
avg.radiationLength(), avg.interactionLength(),
path_length, path_length,
--
GitLab