From d8fd5e646e0feebe5fd7c0df952c4e8a179265db Mon Sep 17 00:00:00 2001
From: Frank Gaede <frank.gaede@desy.de>
Date: Wed, 27 Jan 2016 16:42:49 +0000
Subject: [PATCH] - fixed printlevel in Geant4Action::print() - removed
random lines drawn in teveDisplay - dont't print DetectorData by default in
dumpdetector
---
DDG4/plugins/Geant4SDActions.cpp | 4 ++++
DDG4/plugins/Geant4TrackerWeightedSD.cpp | 4 ++++
DDG4/src/Geant4Action.cpp | 2 +-
UtilityApps/src/dumpdetector.cpp | 2 +-
UtilityApps/src/next_event_dummy.cpp | 4 ++--
5 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/DDG4/plugins/Geant4SDActions.cpp b/DDG4/plugins/Geant4SDActions.cpp
index 2bee9fce9..0a5e888a6 100644
--- a/DDG4/plugins/Geant4SDActions.cpp
+++ b/DDG4/plugins/Geant4SDActions.cpp
@@ -343,6 +343,10 @@ namespace DD4hep {
/// Method for generating hit(s) using the information of G4Step object.
G4bool process(G4Step* step, G4TouchableHistory* ) {
Geant4StepHandler h(step);
+
+ // std::cout << " process called - pre pos: " << h.prePos() << " post pos " << h.postPos()
+ // << " edep: " << h.deposit() << std::endl ;
+
void *prePV = h.volume(h.pre), *postPV = h.volume(h.post);
Geant4HitCollection* coll = sensitive->collection(0);
diff --git a/DDG4/plugins/Geant4TrackerWeightedSD.cpp b/DDG4/plugins/Geant4TrackerWeightedSD.cpp
index 3d21129cc..aeaed40d8 100644
--- a/DDG4/plugins/Geant4TrackerWeightedSD.cpp
+++ b/DDG4/plugins/Geant4TrackerWeightedSD.cpp
@@ -229,6 +229,10 @@ namespace DD4hep {
/// Method for generating hit(s) using the information of G4Step object.
G4bool process(const G4Step* step, G4TouchableHistory* ) {
Geant4StepHandler h(step);
+
+ // std::cout << " process called - pre pos: " << h.prePos() << " post pos " << h.postPos()
+ // << " edep: " << h.deposit() << std::endl ;
+
G4VSolid* preSolid = h.solid(h.pre);
G4VSolid* postSolid = h.solid(h.post);
G4ThreeVector local_pre = h.globalToLocalG4(h.prePosG4());
diff --git a/DDG4/src/Geant4Action.cpp b/DDG4/src/Geant4Action.cpp
index ede1afe22..24142792f 100644
--- a/DDG4/src/Geant4Action.cpp
+++ b/DDG4/src/Geant4Action.cpp
@@ -152,7 +152,7 @@ void Geant4Action::configureFiber(Geant4Context* /* thread_context */) {
/// Support for messages with variable output level using output level
void Geant4Action::print(const char* fmt, ...) const {
- int level = outputLevel();
+ int level = max(int(outputLevel()),(int)VERBOSE);
if ( level >= printLevel() ) {
va_list args;
va_start(args, fmt);
diff --git a/UtilityApps/src/dumpdetector.cpp b/UtilityApps/src/dumpdetector.cpp
index 292a3629e..a0d37d087 100644
--- a/UtilityApps/src/dumpdetector.cpp
+++ b/UtilityApps/src/dumpdetector.cpp
@@ -179,7 +179,7 @@ int main(int argc, char** argv ){
std::cout << de.name() << "[ path: "<< de.placementPath () << "] (id: " << de.id() << ") - sens type : " << lcdd.sensitiveDetector( de.name() ).type() << "\t surfaces : " << ( sL.empty() ? 0 : sL.size() ) << std::endl ;
- printDetectorData( de ) ;
+ // printDetectorData( de ) ;
if( printSurfaces ){
for( SurfaceList::const_iterator sit = sL.begin() ; sit != sL.end() ; ++sit ){
diff --git a/UtilityApps/src/next_event_dummy.cpp b/UtilityApps/src/next_event_dummy.cpp
index ae4c0da07..c8f8fd09b 100644
--- a/UtilityApps/src/next_event_dummy.cpp
+++ b/UtilityApps/src/next_event_dummy.cpp
@@ -21,7 +21,7 @@ void next_event(){
static int count = 1 ;
- std::cout << " next_event called - just draw some random lines ... " << std::endl ;
+ std::cout << " next_event called - nothing to do ... " << std::endl ;
TEveElementList* tevent = (TEveElementList* ) gEve->GetCurrentEvent() ;
@@ -29,7 +29,7 @@ void next_event(){
tevent->DestroyElements() ;
- lineset( count, count ) ;
+ // lineset( count, count ) ;
gEve->Redraw3D();
--
GitLab