Merge branch 'master-cabling-db' into 'master-cabling-db'

Clean up file naming

See merge request faser/calypso!190

Generators/ReadGenie/CMakeLists.txt → Generators/GenieReader/CMakeLists.txt

@@ -3,7 +3,7 @@
 ################################################################################
 
 # Declare the package name:
-atlas_subdir( ReadGenie )
+atlas_subdir( GenieReader )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

Generators/ReadGenie/share/ReadGenie_jobOptions.py → Generators/GenieReader/share/GenieReader_jobOptions.py

 #
-#  Usage: athena.py -c'INPUT=["faser.1.gfaser.root","faser.2.gfaser.root"]; OUTPUT="gFaser.EVNT.pool.root"; EVTMAX=100' ReadGenie_jobOptions.py
+#  Usage: athena.py -c'INPUT=["faser.1.gfaser.root","faser.2.gfaser.root"]; OUTPUT="gFaser.EVNT.pool.root"; EVTMAX=100' GenieReader/GenieReader_jobOptions.py >& GenieReader.log
 #
 #  INPUT and OUTPUT are mandatory (INPUT can be a list, as shown above)
 #  EVTMAX can be omitted; then all input files are read to the end
@@ -22,7 +22,7 @@ import AthenaRootComps.ReadAthenaRoot
 svcMgr.EventSelector.InputCollections = INPUT
 svcMgr.EventSelector.TupleName = "gFaser"
 
-from ReadGenie.GenieReader import GenieReader
+from GenieReader.GenieReaderAlg import GenieReader
 
 from AthenaCommon.AlgSequence import AlgSequence
 job = AlgSequence()