From 1dec81c67a5b26d1db42fe89ecd92e67df0e9f7d Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Tue, 24 Mar 2020 05:42:09 -0500
Subject: [PATCH] modified: scripts/example_hit_recon.cxx
modified: scripts/example_tracking.cxx
---
scripts/example_hit_recon.cxx | 2 +-
scripts/example_tracking.cxx | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/scripts/example_hit_recon.cxx b/scripts/example_hit_recon.cxx
index 9798a15..70f865a 100644
--- a/scripts/example_hit_recon.cxx
+++ b/scripts/example_hit_recon.cxx
@@ -47,7 +47,7 @@ void example_hit_recon(const char* fname = "gem_tracker_digi.root"){
auto nhits = [] (const std::vector<dd4hep::sim::Geant4Tracker::Hit*>& hits){ return hits.size(); };
dd4hep::Detector& detector = dd4hep::Detector::getInstance();
- detector.fromCompact("gem_tracker_disc.xml");
+ detector.fromCompact("gem_tracker.xml");
dd4hep::rec::CellIDPositionConverter cellid_converter(detector);
dd4hep::rec::SurfaceManager& surfMan = *detector.extension<dd4hep::rec::SurfaceManager>() ;
diff --git a/scripts/example_tracking.cxx b/scripts/example_tracking.cxx
index 460fe58..0871b8b 100644
--- a/scripts/example_tracking.cxx
+++ b/scripts/example_tracking.cxx
@@ -1,5 +1,6 @@
R__LOAD_LIBRARY(libGenFind)
R__LOAD_LIBRARY(libgenfit2)
+R__LOAD_LIBRARY(libDDG4IO.so)
#include "ConstField.h"
#include "Exception.h"
@@ -76,7 +77,8 @@ R__LOAD_LIBRARY(libgenfit2)
void example_tracking(const char* fname = "gem_tracker_recon.root"){
- ROOT::EnableImplicitMT(1);
+ //ROOT::EnableImplicitMT(0);
+ ROOT::DisableImplicitMT(); // Tell ROOT you want to go parallel
using namespace ROOT::Math;
using namespace genfind;
@@ -98,7 +100,7 @@ void example_tracking(const char* fname = "gem_tracker_recon.root"){
auto nhits = [] (const std::vector<dd4hep::sim::Geant4Tracker::Hit*>& hits){ return hits.size(); };
dd4hep::Detector& detector = dd4hep::Detector::getInstance();
- detector.fromCompact("gem_tracker_disc.xml");
+ detector.fromCompact("gem_tracker.xml");
dd4hep::rec::CellIDPositionConverter cellid_converter(detector);
ROOT::Math::XYZVector position = {0,0,0}; // position to calculate magnetic field at (the origin in this case)
@@ -236,7 +238,7 @@ void example_tracking(const char* fname = "gem_tracker_recon.root"){
}
display->addEvent(all_tracks);
//std::cout << " |P| = " << (*mc_particles)[0]->psx << ", " << (*mc_particles)[0]->psy << ", " << (*mc_particles)[0]->psz << std::endl ;
- //display->open();
+ display->open();
//std::string dummy;
//std::cout << "Enter to continue..." << std::endl;
//std::getline(std::cin, dummy);
--
GitLab