GroupData migration of MuCpti config files (ATR-15657) (TrigT1Muctpi-00-07-00)

	* Read Muctpi configuration from GroupData area (ATR-15657)
	* python/TrigT1MuctpiConfig.py: Use the check-summed file name to avoid duplication
	* Tagging as TrigT1Muctpi-00-07-00

Trigger/TrigT1/TrigT1Muctpi/python/TrigT1MuctpiConfig.py

 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-# $Id: TrigT1MuctpiConfig.py 726107 2016-02-25 11:04:42Z wengler $
+# $Id: TrigT1MuctpiConfig.py 794528 2017-01-30 12:36:33Z fwinkl $
 
 # Local (generated) configurable(s):
 from TrigT1Muctpi.TrigT1MuctpiConf import LVL1MUCTPI__L1Muctpi
@@ -54,7 +54,7 @@ class DefaultL1Muctpi( LVL1MUCTPI__L1Muctpi ):
       pass
 
     # Set properties for NIM outputs ot L1Topo conversion from RoI to eta/phi
-    self.GeometryXMLFile = "TrigConfMuctpi/TestMioctGeometry.xml"
+    self.GeometryXMLFile = "TrigConfMuctpi/TestMioctGeometry_2016_05_30_CS_2600573263.xml"
 
     # Turn on the NIM output creation by default:
     self.DoNIMOutput = True
@@ -200,7 +200,7 @@ class DefaultL1MuctpiTool( LVL1MUCTPI__L1MuctpiTool ):
       pass
 
     # Set properties for NIM outputs ot L1Topo conversion from RoI to eta/phi
-    self.GeometryXMLFile = "TrigConfMuctpi/TestMioctGeometry.xml"
+    self.GeometryXMLFile = "TrigConfMuctpi/TestMioctGeometry_2016_05_30_CS_2600573263.xml"
 
     # Turn on the NIM output creation by default:
     self.DoNIMOutput = True

Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1Muctpi.cxx

@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: L1Muctpi.cxx 726107 2016-02-25 11:04:42Z wengler $
+// $Id: L1Muctpi.cxx 794528 2017-01-30 12:36:33Z fwinkl $
 
 // STL include(s):
 #include <iostream>
@@ -152,7 +152,7 @@ namespace LVL1MUCTPI {
       }
 
       ATH_MSG_INFO( "XML LUT file defined in jobO: " << m_lutXMLFile << " with a RunPeriod=" << m_runPeriod );
-      const std::string fullFileName = PathResolverFindXMLFile( m_lutXMLFile );
+      const std::string fullFileName = PathResolverFindCalibFile( m_lutXMLFile );
       ATH_MSG_DEBUG( "Full path to XML LUT file: " << fullFileName );
       CHECK( m_theMuctpi->initializeLUTOverlapStrategy( fullFileName, m_flagMode,
 							m_dumpLut, m_runPeriod ) );
@@ -171,7 +171,7 @@ namespace LVL1MUCTPI {
     //
       
     ATH_MSG_INFO( "Geometry XML file defined in jobO: " << m_geometryXMLFile );
-    const std::string fullGeometryFileName = PathResolverFindXMLFile( m_geometryXMLFile );
+    const std::string fullGeometryFileName = PathResolverFindCalibFile( m_geometryXMLFile );
     ATH_MSG_INFO( "Full path to Geometry XML file: " << fullGeometryFileName );
 
     m_theMuctpi->setupL1TopoConverter(fullGeometryFileName);
@@ -197,8 +197,8 @@ namespace LVL1MUCTPI {
       ATH_MSG_INFO( "XML multiplicity file defined in jobO: "
 		    << m_multiplicityXMLFile );
       const std::string packagePrefix = "TrigT1Muctpi/";
-      const std::string fullFileName = PathResolverFindXMLFile( packagePrefix +
-								m_multiplicityXMLFile );
+      const std::string fullFileName = PathResolverFindCalibFile( packagePrefix +
+                                                                  m_multiplicityXMLFile );
       ATH_MSG_DEBUG( " Full path to XML file: " << fullFileName );
       m_theMuctpi->initializeXMLMultStrategy( fullFileName );
 

Trigger/TrigT1/TrigT1Muctpi/src/Algorithms/L1MuctpiTool.cxx

@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: L1MuctpiTool.cxx 733326 2016-04-01 11:39:10Z wengler $
+// $Id: L1MuctpiTool.cxx 794528 2017-01-30 12:36:33Z fwinkl $
 
 // STL include(s):
 #include <iostream>
@@ -169,7 +169,7 @@ namespace LVL1MUCTPI {
       }
 
       ATH_MSG_INFO( "XML LUT file defined in jobO: " << m_lutXMLFile << " with a RunPeriod=" << m_runPeriod );
-      const std::string fullFileName = PathResolverFindXMLFile( m_lutXMLFile );
+      const std::string fullFileName = PathResolverFindCalibFile( m_lutXMLFile );
       ATH_MSG_DEBUG( "Full path to XML LUT file: " << fullFileName );
       CHECK( m_theMuctpi->initializeLUTOverlapStrategy( fullFileName, m_flagMode,
 							m_dumpLut, m_runPeriod ) );
@@ -188,7 +188,7 @@ namespace LVL1MUCTPI {
     //
       
     ATH_MSG_INFO( "Geometry XML file defined in jobO: " << m_geometryXMLFile );
-    const std::string fullGeometryFileName = PathResolverFindXMLFile( m_geometryXMLFile );
+    const std::string fullGeometryFileName = PathResolverFindCalibFile( m_geometryXMLFile );
     ATH_MSG_INFO( "Full path to Geometry XML file: " << fullGeometryFileName );
 
     m_theMuctpi->setupL1TopoConverter(fullGeometryFileName);
@@ -212,10 +212,10 @@ namespace LVL1MUCTPI {
       m_theMuctpi->setMultiplicityStrategy( XML );
 
       ATH_MSG_INFO( "XML multiplicity file defined in jobO: "
-		    << m_multiplicityXMLFile );
+                    << m_multiplicityXMLFile );
       const std::string packagePrefix = "TrigT1Muctpi/";
-      const std::string fullFileName = PathResolverFindXMLFile( packagePrefix +
-								m_multiplicityXMLFile );
+      const std::string fullFileName = PathResolverFindCalibFile( packagePrefix +
+                                                                  m_multiplicityXMLFile );
       ATH_MSG_DEBUG( " Full path to XML file: " << fullFileName );
       m_theMuctpi->initializeXMLMultStrategy( fullFileName );