Merge pull request #535 from sophiemiddleton/EventDisplayUpdate2D

Update paths to GDML and static graphics in the TEve display
Mu2e · Jul 24, 2021 · 51af370 · 51af370
2 parents 9ddb4e5 + 4941f91
commit 51af370
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/TEveEventDisplay/src/TEveMu2eMainWindow.cc b/TEveEventDisplay/src/TEveMu2eMainWindow.cc
@@ -1,6 +1,6 @@
 //TEveMu2e:
 #include "Offline/TEveEventDisplay/src/TEveMu2e_base_classes/TEveMu2eMainWindow.h"
-
+#include "Offline/ConfigTools/inc/ConfigFileLookupPolicy.hh"
 namespace fhicl
 {
   class ParameterSet;
@@ -233,7 +233,8 @@ namespace mu2e{
         Gobutton->Associate(this);
 
         //Add Mu2e logo
-        std::string logoFile = "TEveEventDisplay/src/Icons/mu2e_logo_oval.png";
+        ConfigFileLookupPolicy configFile;
+        std::string logoFile =  configFile("Offline/TEveEventDisplay/src/Icons/mu2e_logo_oval.png");
         const TGPicture *logo = gClient->GetPicture(logoFile.c_str());
         TGIcon *icon = new TGIcon(navFrame,logo,50,50);
         navFrame->AddFrame(icon,new TGLayoutHints(kLHintsLeft,20,0,0,0));
@@ -252,12 +253,12 @@ namespace mu2e{
         centenergyframe->AddFrame(cmaxenergy,new TGLayoutHints(kLHintsExpandX));
         cmaxenergy->Associate(this);
 
-        std::string clusterenergy = "TEveEventDisplay/src/Icons/purplegradient.png";
+        std::string clusterenergy =  configFile("Offline/TEveEventDisplay/src/Icons/purplegradient.png");
         const TGPicture *ce = gClient->GetPicture(clusterenergy.c_str());
         TGIcon *ceicon = new TGIcon(evtidFrame, ce, 40, 8);
 
         helabel = new TGLabel(evtidFrame, "Hit Energy");
-        std::string hitenergy = "TEveEventDisplay/src/Icons/greengradient.png";
+        std::string hitenergy = configFile("Offline/TEveEventDisplay/src/Icons/greengradient.png");;
         const TGPicture *he = gClient->GetPicture(hitenergy.c_str());
         TGIcon *heicon = new TGIcon(evtidFrame, he, 40 ,8);
 
@@ -546,8 +547,11 @@ namespace mu2e{
     gEve->GetGlobalScene()->DestroyElements();
 
     // Import the GDML of entire Mu2e Geometry
-    geom = mu2e_geom->Geom_Interface::getGeom("TEveEventDisplay/src/fix.gdml");
-
+    ConfigFileLookupPolicy configFile;
+    std::string fn =  configFile("Offline/TEveEventDisplay/src/fix.gdml");
+
+    geom = mu2e_geom->Geom_Interface::getGeom(fn);
+
     //Get Top Volume
     TGeoVolume* topvol = geom->GetTopVolume();
 

diff --git a/TEveEventDisplay/src/TEveMu2e_base_classes/TEveMu2eMainWindow.h b/TEveEventDisplay/src/TEveMu2e_base_classes/TEveMu2eMainWindow.h
@@ -44,9 +44,11 @@
 //Mu2e:
 #include "art/Framework/Principal/Event.h"
 #include "art/Framework/Principal/Run.h"
+
 #include "Offline/ConfigTools/inc/SimpleConfig.hh"
 #include "Offline/GeometryService/inc/GeomHandle.hh"
 //...TEveMu2e
+
 #include "Offline/TEveEventDisplay/src/TEveMu2e_base_classes/TEveMu2eHit.h"
 #include "Offline/TEveEventDisplay/src/TEveMu2e_base_classes/TEveMu2eCluster.h"
 #include "Offline/TEveEventDisplay/src/TEveMu2e_base_classes/TEveMu2eCustomHelix.h"