Merge pull request #201 from sophiemiddleton/Mu2eDisplay

sophiemiddleton · web-flow · commit db2a5e438acc · 2025-03-26T14:06:06.000-05:00
A few name fixes
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-# Mu2eEventDisplay
+# EventDisplay
 
-This repo contains the current Mu2eEventDisplay source code, example fcls, tutorials and documentation.
+This repo contains the current EventDisplay source code, example fcls, tutorials and documentation.
 
-The Mu2eEventDisplay is based on REve which is an updated version of the well-known and widely used TEve ROOT based Event Visualization Software. REve uses modernized infrastcutrue and allows Web Access for remote use.
+The EventDisplay is based on REve which is an updated version of the well-known and widely used TEve ROOT based Event Visualization Software. REve uses modernized infrastcutrue and allows Web Access for remote use.
 
 For more information about REve and the implementation for Mu2e see: https://mu2ewiki.fnal.gov/wiki/Eve7EventDisplay#Examples_of_the_Eve-7_Mu2e_Display.
 
@@ -13,12 +13,12 @@ You can run the REve Mu2e code in the same way as any analyzer in Mu2e Offline.
 A number of "examples" are contained in the "examples" directory. The nominal_example.fcl is used for displaying reconstructed (and true MC) for nominal geometry:
 
 ```
-mu2e -c Mu2eEventDisplay/examples/nominal_example.fcl FILENAME.art  
+mu2e -c EventDisplay/examples/nominal_example.fcl FILENAME.art  
 ```
 
 Things can be added and removed on the GUI once set to "true" in the FCL. Just uncheck the boxes associated with the geometry you want to remove.
 
-NOTE: you should run this from your working directory, not inside of Mu2eEventDisplay. This is for the firefox browser path #FIXME.
+NOTE: you should run this from your working directory, not inside of EventDisplay. This is for the firefox browser path #FIXME.
 
 For extracted position data/MC please use the extracted_example.fcl
 
diff --git a/examples/cosmic_example.fcl b/examples/cosmic_example.fcl
diff --git a/examples/extracted_example.fcl b/examples/extracted_example.fcl
@@ -3,7 +3,7 @@
 #include "Offline/fcl/minimalMessageService.fcl"
 #include "Offline/fcl/standardProducers.fcl"
 #include "Offline/fcl/standardServices.fcl"
-#include "Mu2eEventDisplay/fcl/prolog.fcl"
+#include "EventDisplay/fcl/prolog.fcl"
 services : @local::Services.Reco
 process_name : HelixED
 source : { module_type : RootInput }
diff --git a/examples/multihelix_example.fcl b/examples/multihelix_example.fcl
diff --git a/examples/nominal_example.fcl b/examples/nominal_example.fcl
@@ -3,7 +3,7 @@
 #include "Offline/fcl/minimalMessageService.fcl"
 #include "Offline/fcl/standardProducers.fcl"
 #include "Offline/fcl/standardServices.fcl"
-#include "Mu2eEventDisplay/fcl/prolog.fcl"
+#include "EventDisplay/fcl/prolog.fcl"
 
 services : @local::Services.Reco
 
diff --git a/examples/reflection_example.fcl b/examples/reflection_example.fcl
@@ -3,7 +3,7 @@
 #include "Offline/fcl/minimalMessageService.fcl"
 #include "Offline/fcl/standardProducers.fcl"
 #include "Offline/fcl/standardServices.fcl"
-#include "Mu2eEventDisplay/fcl/prolog.fcl"
+#include "EventDisplay/fcl/prolog.fcl"
 
 services : @local::Services.Reco
 
diff --git a/examples/select_event_extracted_example.fcl b/examples/select_event_extracted_example.fcl
@@ -3,7 +3,7 @@
 #include "Offline/fcl/minimalMessageService.fcl"
 #include "Offline/fcl/standardProducers.fcl"
 #include "Offline/fcl/standardServices.fcl"
-#include "Mu2eEventDisplay/fcl/prolog.fcl"
+#include "EventDisplay/fcl/prolog.fcl"
 
 services : @local::Services.Reco
 
diff --git a/examples/simple_helix_example.fcl b/examples/simple_helix_example.fcl
diff --git a/src/DataInterface.cc b/src/DataInterface.cc
@@ -12,7 +12,7 @@
 using namespace mu2e;
 namespace REX = ROOT::Experimental;
 
-std::string drawfilename("Mu2eEventDisplay/config/drawutils.txt");
+std::string drawfilename("EventDisplay/config/drawutils.txt");
 SimpleConfig drawconfig(drawfilename);
 
 
diff --git a/src/MCInterface.cc b/src/MCInterface.cc
@@ -92,7 +92,7 @@ void MCInterface::SetLineColorPID(int PDGCode,REX::REveLine *line){
 
 void MCInterface::AddMCTrajectoryCollection(REX::REveManager *&eveMng, bool firstloop,  std::tuple<std::vector<std::string>, std::vector<const MCTrajectoryCollection *>> mctrack_tuple, REX::REveElement* &scene, std::vector<int> particleIds, bool extracted){
   std::cout<<"[ REveMCInterface::AddMCTrajectoryCollection() ]"<<std::endl;
-  std::string drawfilename("Mu2eEventDisplay/config/drawutils.txt");
+  std::string drawfilename("EventDisplay/config/drawutils.txt");
   SimpleConfig drawconfig(drawfilename);
 
   // eEtract the track and input tag:
@@ -168,7 +168,7 @@ void MCInterface::AddSurfaceStepCollection(REX::REveManager *&eveMng, bool first
       
       // make compund object to store hits
       auto allpoints = new REX::REveCompound(comptitle,comptitle,1);
-      std::string drawfilename("Mu2eEventDisplay/config/drawutils.txt");
+      std::string drawfilename("EventDisplay/config/drawutils.txt");
       SimpleConfig drawconfig(drawfilename);
 
       // eXtract the track and input tag:
diff --git a/src/MainWindow.cc b/src/MainWindow.cc
@@ -14,7 +14,7 @@ double nCrystals = 674;
 double FrontTracker_gdmltag;
 
 // Get geom information from Event Display configs:
-std::string drawoptfilename("Mu2eEventDisplay/config/drawutils.txt");
+std::string drawoptfilename("EventDisplay/config/drawutils.txt");
 SimpleConfig drawconfigf(drawoptfilename);
 
 void MainWindow::makeEveGeoShape(TGeoNode* n, REX::REveTrans& trans, REX::REveElement* holder, int val, bool crystal1, bool crystal2, std::string name, int color)
diff --git a/src/Mu2eEventDisplay_module.cc b/src/Mu2eEventDisplay_module.cc
@@ -463,7 +463,7 @@ namespace mu2e
       frame_->makeGeometryScene(eveMng_, geomOpts, gdmlname_);
 
       //add path to the custom GUI code here, this overrides ROOT GUI
-      eveMng_->AddLocation("mydir/", "Mu2eEventDisplay/CustomGUIv2");
+      eveMng_->AddLocation("mydir/", "EventDisplay/CustomGUIv2");
       eveMng_->SetDefaultHtmlPage("file:mydir/eventDisplay.html");
 
       // InitGuiInfo() cont'd
diff --git a/src/SConscript b/src/SConscript
@@ -41,7 +41,7 @@ elif len(x[2]) == 2:
   iletter=0
 
 else:
-  print ( 'Aborting building in Mu2eEventDisplay/src/SConscript' )
+  print ( 'Aborting building in EventDisplay/src/SConscript' )
   print ( 'Cannot parse ROOT_VERSION: ', root_version )
   print ( 'Patch field must be 2 or 3 characters long' )
   Exit(2)
