Merge branch 'master' into artv30800

Mu2e · May 28, 2021 · 545d1ad · 545d1ad
2 parents 14d91da + 244a330
commit 545d1ad
Show file tree

Hide file tree

Showing 325 changed files with 1,898 additions and 15,432 deletions.
diff --git a/Analyses/fcl/simParticleAnalyzer.fcl b/Analyses/fcl/simParticleAnalyzer.fcl
@@ -9,8 +9,8 @@ process_name : SimParticleAnalyzer
 services : {
    message : @local::default_message
    GeometryService : { inputFile : "Mu2eG4/geom/geom_common.txt" }  
-   ConditionsService :{ conditionsfile : "Mu2eG4/test/conditions_01.txt" } 
-   GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+   ConditionsService :{ conditionsfile : "ConditionsService/data/conditions_01.txt" } 
+   GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 }
 
 physics :

diff --git a/Analyses/test/ConversionEnergyLoss.fcl b/Analyses/test/ConversionEnergyLoss.fcl
@@ -47,10 +47,10 @@ services :
 
    ConditionsService :
    {
-      conditionsfile : "Mu2eG4/test/conditions_01.txt"
+      conditionsfile : "ConditionsService/data/conditions_01.txt"
    }
 
-   GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+   GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 
 } # close of services block
@@ -70,7 +70,7 @@ physics :
     {
       module_type          : G4
       generatorModuleLabel : generate
-      # visMacro           : "Mu2eG4/test/visyz.mac"
+      # visMacro           : "Mu2eG4/vis/visyz.mac"
       stepsSizeLimit       : 10000                   # StepPoint
       particlesSizeLimit   : 10000                   # SimParticle
       seed                 : [9877]

diff --git a/Analyses/test/InteractiveRoot.fcl b/Analyses/test/InteractiveRoot.fcl
@@ -25,8 +25,8 @@ services : {
    TFileService : { fileName : "interactiveRoot.root"  }
 
    GeometryService        : { inputFile      : "Mu2eG4/geom/geom_common.txt"            }
-   ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"      }
-   GlobalConstantsService : { inputFile      : "Mu2eG4/test/globalConstants_01.txt" }
+   ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"      }
+   GlobalConstantsService : { inputFile      : "GlobalConstantsService/data/globalConstants_01.txt" }
 }
 
 physics : {

diff --git a/Analyses/test/InteractiveRoot2.fcl b/Analyses/test/InteractiveRoot2.fcl
@@ -25,8 +25,8 @@ services : {
    TFileService : { fileName : "interactiveRoot.root"  }
 
    GeometryService        : { inputFile      : "Mu2eG4/geom/geom_common.txt"            }
-   ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"      }
-   GlobalConstantsService : { inputFile      : "Mu2eG4/test/globalConstants_01.txt" }
+   ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"      }
+   GlobalConstantsService : { inputFile      : "GlobalConstantsService/data/globalConstants_01.txt" }
 }
 
 physics : {

diff --git a/Analyses/test/PionMomentumAnalyzer.fcl b/Analyses/test/PionMomentumAnalyzer.fcl
@@ -8,8 +8,8 @@ source: { module_type: RootInput }
 services: {
    message: @local::default_message
    TFileService: { fileName: "nts.owner.pionMomentum.ver.seq.root" }
-   ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"      }
-   GlobalConstantsService: { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+   ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"      }
+   GlobalConstantsService: { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
    GeometryService        : { inputFile      : "JobConfig/common/geom_baseline.txt" }
 }
 

diff --git a/Analyses/test/SelectiveStepPtPrinter_g4s1.fcl b/Analyses/test/SelectiveStepPtPrinter_g4s1.fcl
@@ -22,8 +22,8 @@ services : {
     RandomNumberGenerator  : {defaultEngineKind: "MixMaxRng"}
 
     GeometryService        : { inputFile : "Mu2eG4/geom/geom_common_current.txt" }
-    ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt" }
-    GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+    ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt" }
+    GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
     SeedService            : @local::automaticSeeds
     Mu2eG4Helper           : { }
 }

diff --git a/Analyses/test/TVirtDebug.fcl b/Analyses/test/TVirtDebug.fcl
@@ -20,8 +20,8 @@ services : {
    TFileService : { fileName : "readback.root" }
 
    GeometryService        : { inputFile : "Mu2eG4/geom/geom_common.txt"     }
-   ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"     }
-   GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+   ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"     }
+   GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 }
 
 physics : {

diff --git a/Analyses/test/TestTO.fcl b/Analyses/test/TestTO.fcl
@@ -38,7 +38,7 @@ services :
     conditionsfile : "Mu2eG4/test/conditions_01_it.txt"
   }
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
   Mu2eG4Helper : { }
 

diff --git a/Analyses/test/cosmicFilter.fcl b/Analyses/test/cosmicFilter.fcl
@@ -34,10 +34,10 @@ services : {
   }
 
   ConditionsService : {
-    conditionsfile : "Mu2eG4/test/conditions_01.txt"
+    conditionsfile : "ConditionsService/data/conditions_01.txt"
   }
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
   BTrkHelper : @local::BTrkHelperDefault
   Mu2eG4Helper   : { }
 

diff --git a/Analyses/test/extmon_uci_readback.fcl b/Analyses/test/extmon_uci_readback.fcl
@@ -33,10 +33,10 @@ services :
 
   ConditionsService :
   {
-    conditionsfile : "Mu2eG4/test/conditions_01.txt"
+    conditionsfile : "ConditionsService/data/conditions_01.txt"
   }  
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 }
 

diff --git a/Analyses/test/genMixReco.fcl b/Analyses/test/genMixReco.fcl
@@ -43,8 +43,8 @@ services : {
 
     # Mu2e services
     GeometryService        : { inputFile      : "JobConfig/TDR/geom_MothersToHits.txt" }
-    ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"        }
-    GlobalConstantsService : { inputFile      : "Mu2eG4/test/globalConstants_01.txt"   }
+    ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"        }
+    GlobalConstantsService : { inputFile      : "GlobalConstantsService/data/globalConstants_01.txt"   }
     Mu2eG4Helper           : { }
     BTrkHelper             : @local::BTrkHelperDefault
     SeedService            : @local::automaticSeeds

diff --git a/Analyses/test/histforpabs.fcl b/Analyses/test/histforpabs.fcl
@@ -40,10 +40,10 @@ services :
 
   ConditionsService :
   {
-    conditionsfile : "Mu2eG4/test/conditions_01.txt"
+    conditionsfile : "ConditionsService/data/conditions_01.txt"
   }
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 } # close of services block
 

diff --git a/Analyses/test/hitDisplay.fcl b/Analyses/test/hitDisplay.fcl
@@ -38,10 +38,10 @@ services :
   }
 
   ConditionsService : {
-    conditionsfile : "Mu2eG4/test/conditions_01.txt"
+    conditionsfile : "ConditionsService/data/conditions_01.txt"
   }
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
   BTrkHelper             : @local::BTrkHelperDefault
 
 } # close of services block

diff --git a/Analyses/test/isoRPCtest.fcl b/Analyses/test/isoRPCtest.fcl
@@ -45,10 +45,10 @@ services :
 
   ConditionsService :
   {
-    conditionsfile : "Mu2eG4/test/conditions_01.txt"
+    conditionsfile : "ConditionsService/data/conditions_01.txt"
   }
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 } # close of services block
 
 physics :
@@ -67,7 +67,7 @@ physics :
     {
       module_type          : G4
       generatorModuleLabel : generate
-      # visMacro           : "Mu2eG4/test/visyz.mac"
+      # visMacro           : "Mu2eG4/vis/visyz.mac"
       stepsSizeLimit       : 10000                   # StepPoint
       particlesSizeLimit   : 10000                   # SimParticle
       seed                 : [9877]

diff --git a/Analyses/test/materailsPropStudy.fcl b/Analyses/test/materailsPropStudy.fcl
@@ -25,9 +25,9 @@ services :
 
   GeometryService : { inputFile : "Mu2eG4/geom/geom_common.txt" }
 
-  ConditionsService : { conditionsfile : "Mu2eG4/test/conditions_01.txt" }
+  ConditionsService : { conditionsfile : "ConditionsService/data/conditions_01.txt" }
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
   Mu2eG4Helper : { }
 

diff --git a/Analyses/test/mixPointsDump.fcl b/Analyses/test/mixPointsDump.fcl
@@ -11,8 +11,8 @@ services: {
     TFileService: { fileName: "stepPoints.root" }
     message: @local::default_message
     RandomNumberGenerator: {defaultEngineKind: "MixMaxRng" }
-    ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"      }
-    GlobalConstantsService: { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+    ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"      }
+    GlobalConstantsService: { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
     SeedService: @local::automaticSeeds
 }
 

diff --git a/Analyses/test/pbars1hist.fcl b/Analyses/test/pbars1hist.fcl
@@ -8,8 +8,8 @@ source: { module_type: RootInput }
 services: {
    message: @local::default_message
    TFileService: { fileName: "pbars1hist.root" }
-   ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"      }
-   GlobalConstantsService: { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+   ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"      }
+   GlobalConstantsService: { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
    GeometryService        : { inputFile      : "JobConfig/common/geom_baseline.txt" }
 }
 

diff --git a/Analyses/test/printStrawHits.fcl b/Analyses/test/printStrawHits.fcl
@@ -18,8 +18,8 @@ services : {
   message : @local::default_message
 
   GeometryService        : { inputFile      : "Mu2eG4/geom/geom_common.txt"            }
-  ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"      }
-  GlobalConstantsService : { inputFile      : "Mu2eG4/test/globalConstants_01.txt" }
+  ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"      }
+  GlobalConstantsService : { inputFile      : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 }
 

diff --git a/Analyses/test/printTrackerGeom.fcl b/Analyses/test/printTrackerGeom.fcl
@@ -19,8 +19,8 @@ services : {
 
 # GeometryService        : { inputFile      : "Mu2eG4/geom/geom_common.txt"            }
   GeometryService        : { inputFile      : "gtest1.txt"                         }
-  ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"      }
-  GlobalConstantsService : { inputFile      : "Mu2eG4/test/globalConstants_01.txt" }
+  ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"      }
+  GlobalConstantsService : { inputFile      : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 }
 

diff --git a/Analyses/test/psVacuum_readback.fcl b/Analyses/test/psVacuum_readback.fcl
@@ -35,10 +35,10 @@ services :
 
   ConditionsService :
   {
-    conditionsfile : "Mu2eG4/test/conditions_01.txt"
+    conditionsfile : "ConditionsService/data/conditions_01.txt"
   }  
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 }
 

diff --git a/Analyses/test/readCaloDigi.fcl b/Analyses/test/readCaloDigi.fcl
@@ -22,8 +22,8 @@ services : {
     RandomNumberGenerator : {defaultEngineKind: "MixMaxRng" }
 
     GeometryService        : { inputFile      : "Mu2eG4/geom/geom_common.txt" }
-    ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"        }
-    GlobalConstantsService : { inputFile      : "Mu2eG4/test/globalConstants_01.txt"   }
+    ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"        }
+    GlobalConstantsService : { inputFile      : "GlobalConstantsService/data/globalConstants_01.txt"   }
     BTrkHelper             : @local::BTrkHelperDefault
     Mu2eG4Helper           : { }
     SeedService            : { @table::automaticSeeds

diff --git a/Analyses/test/readMCTrajectories.fcl b/Analyses/test/readMCTrajectories.fcl
@@ -22,8 +22,8 @@ services :
   TFileService : { fileName : "readMCTrajectories.root" }
 
   GeometryService        : { inputFile      : "Mu2eG4/geom/geom_common.txt"       }
-  ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt" }
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 }
 

diff --git a/Analyses/test/readStoppedPis.fcl b/Analyses/test/readStoppedPis.fcl
@@ -35,10 +35,10 @@ services :
 
   ConditionsService :
   {
-    conditionsfile : "Mu2eG4/test/conditions_01.txt"
+    conditionsfile : "ConditionsService/data/conditions_01.txt"
   }  
 
-  GlobalConstantsService : {inputFile : "Mu2eG4/test/globalConstants_01.txt"}
+  GlobalConstantsService : {inputFile : "GlobalConstantsService/data/globalConstants_01.txt"}
 
 }
 

diff --git a/Analyses/test/readTrackCluster.fcl b/Analyses/test/readTrackCluster.fcl
@@ -32,8 +32,8 @@ services : {
     RandomNumberGenerator : {defaultEngineKind: "MixMaxRng" }
 
     GeometryService        : { inputFile      : "JobConfig/TDR/geom_MothersToHits.txt" }
-    ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"        }
-    GlobalConstantsService : { inputFile      : "Mu2eG4/test/globalConstants_01.txt"   }
+    ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"        }
+    GlobalConstantsService : { inputFile      : "GlobalConstantsService/data/globalConstants_01.txt"   }
     BTrkHelper             : @local::BTrkHelperDefault
     Mu2eG4Helper           : { }
     SeedService            : @local::automaticSeeds

diff --git a/Analyses/test/readback0.fcl b/Analyses/test/readback0.fcl
@@ -33,10 +33,10 @@ services :
 
   ConditionsService :
   {
-    conditionsfile : "Mu2eG4/test/conditions_01.txt"
+    conditionsfile : "ConditionsService/data/conditions_01.txt"
   }  
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 }
 

diff --git a/Analyses/test/simParticleCheck00.fcl b/Analyses/test/simParticleCheck00.fcl
@@ -50,8 +50,8 @@ services : {
   TFileService :  {  fileName : "simParticleCheck00.root" }
 
   GeometryService        : { inputFile      : "Mu2eG4/geom/geom_common.txt"            }
-  ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"      }
-  GlobalConstantsService : { inputFile      : "Mu2eG4/test/globalConstants_01.txt" }
+  ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"      }
+  GlobalConstantsService : { inputFile      : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 }
 

diff --git a/Analyses/test/simParticlesWithHitsExample.fcl b/Analyses/test/simParticlesWithHitsExample.fcl
@@ -25,9 +25,9 @@ services :
 
   GeometryService : { inputFile : "Mu2eG4/geom/geom_common.txt" }  
 
-  ConditionsService :  { conditionsfile : "Mu2eG4/test/conditions_01.txt" }  
+  ConditionsService :  { conditionsfile : "ConditionsService/data/conditions_01.txt" }  
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 } # close of services block
 

diff --git a/Analyses/test/stoppingTarget00.fcl b/Analyses/test/stoppingTarget00.fcl
@@ -34,10 +34,10 @@ services :
 
   ConditionsService :
   {
-    conditionsfile : "Mu2eG4/test/conditions_01.txt"
+    conditionsfile : "ConditionsService/data/conditions_01.txt"
   }
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 }
 

diff --git a/Analyses/test/transportMuonStudy.fcl b/Analyses/test/transportMuonStudy.fcl
@@ -28,9 +28,9 @@ services :
 
   GeometryService   : { inputFile : "Mu2eG4/geom/geom_common.txt" }
 
-  ConditionsService : { conditionsfile : "Mu2eG4/test/conditions_01.txt" }
+  ConditionsService : { conditionsfile : "ConditionsService/data/conditions_01.txt" }
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
   Mu2eG4Helper : { }
 

diff --git a/Analyses/test/transportMuonStudy_onlyTransport.fcl b/Analyses/test/transportMuonStudy_onlyTransport.fcl
@@ -28,9 +28,9 @@ services :
 
   GeometryService   : { inputFile : "Analyses/test/geom_transportOnly.txt" }
 
-  ConditionsService : { conditionsfile : "Mu2eG4/test/conditions_01.txt" }
+  ConditionsService : { conditionsfile : "ConditionsService/data/conditions_01.txt" }
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
   Mu2eG4Helper : { }
 

diff --git a/Analyses/test/vd_readStage2.fcl b/Analyses/test/vd_readStage2.fcl
@@ -26,8 +26,8 @@ services : {
     RandomNumberGenerator : {defaultEngineKind: "MixMaxRng" }
 
     GeometryService        : { inputFile      : "JobConfig/common/geom_baseline.txt" }
-    ConditionsService      : { conditionsfile : "Mu2eG4/test/conditions_01.txt"      }
-    GlobalConstantsService : { inputFile      : "Mu2eG4/test/globalConstants_01.txt" }
+    ConditionsService      : { conditionsfile : "ConditionsService/data/conditions_01.txt"      }
+    GlobalConstantsService : { inputFile      : "GlobalConstantsService/data/globalConstants_01.txt" }
     Mu2eG4Helper           : { }
     SeedService            : @local::automaticSeeds
 }

diff --git a/Analyses/test/vd_readback.fcl b/Analyses/test/vd_readback.fcl
@@ -35,10 +35,10 @@ services :
 
   ConditionsService :
   {
-    conditionsfile : "Mu2eG4/test/conditions_01.txt"
+    conditionsfile : "ConditionsService/data/conditions_01.txt"
   }  
 
-  GlobalConstantsService : { inputFile : "Mu2eG4/test/globalConstants_01.txt" }
+  GlobalConstantsService : { inputFile : "GlobalConstantsService/data/globalConstants_01.txt" }
 
 }