'CMakeLists.txt' (MuonCalibJobTransforms-00-04-11)

        * fixing skeleton for mdt trf for track storing
	* tagging MuonCalibJobTransforms-00-04-10

MuonSpectrometer/MuonCalib/MuonCalibJobTransforms/CMakeLists.txt

+################################################################################
+# Package: MuonCalibJobTransforms
+################################################################################
+
+# Declare the package name:
+atlas_subdir( MuonCalibJobTransforms )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Tools/PyJobTransformsCore )
+
+# External dependencies:
+find_package( PythonLibs )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+atlas_install_runtime( share/RT_default_comm.dat )
+

MuonSpectrometer/MuonCalib/MuonCalibJobTransforms/share/skeleton.mdt_calib_ntuple.py

@@ -64,7 +64,7 @@ from AthenaCommon.BeamFlags import jobproperties
 from AthenaCommon.GlobalFlags import globalflags
 
 
-# globalflags.DatabaseInstance.set_Value_and_Lock('CONDBR2')   #Fabrizio
+globalflags.DatabaseInstance.set_Value_and_Lock('CONDBR2')   #Fabrizio
 globalflags.DataSource.set_Value_and_Lock('data')
 if globalflags.DataSource() == 'data':
     if cosmicRun:
@@ -115,7 +115,8 @@ from AtlasGeoModel import GeoModelInit
 # Run Moore
 muonRecFlags.doMoore = moore #### SET VIA COMMAND LINE IN THE TRF
 # Run Muonboy
-muonRecFlags.doMuonboy = (mboy or standalone) #### SET VIA COMMAND LINE IN THE TRF
+#muonRecFlags.doMuonboy = (mboy or standalone) #### SET VIA COMMAND LINE IN THE TRF
+muonRecFlags.doMuonboy = mboy
 #NOTE: In 17.2 the 3rd chain cannot run w/o muonboy.
 #turn on/off track reconstruction
 muonRecFlags.doSegmentsOnly = segOnly #### SET VIA COMMAND LINE IN THE TRF
@@ -133,6 +134,7 @@ muonRecFlags.doCalib = False
 muonRecFlags.doCalibNtuple = True 
 muonRecFlags.calibNtupleOutput=NtupleFile ##### SET VIA COMMAND LINE IN THE TRF
 muonRecFlags.calibNtupleSegments = True
+muonRecFlags.calibNtupleTracks = True
 
 # Switch off the T0 fit (on by default for data)
 #muonRecFlags.doSegmentT0Fit = False
@@ -146,6 +148,14 @@ if muonRecFlags.doRPCs:
 if muonRecFlags.doTGCs:
        DetFlags.makeRIO.TGC_setOn()
 
+#Set up new cabling. 
+from MuonMDT_Cabling.MuonMDT_CablingConf import MuonMDT_CablingSvc
+#svcMgr += MuonMDT_CablingSvc(name="MuonMDT_CablingSvc", false , false)
+#svcMgr.MuonMDT_CablingSvc.doCalStreamInit=True
+svcMgr += MuonMDT_CablingSvc(name="MuonMDT_CablingSvc", UseOldCabling=False, ForcedUse=False, doCalStreamInit=True)
+#svcMgr.MuonMDT_CablingSvc.doCalStreamInit=True
+print 'skeleton: setting doCalStreamInit true'
+
 include("MuonRecExample/MuonRDO_to_PRD_jobOptions.py")
    
 # to alter DB options
@@ -197,8 +207,8 @@ except AttributeError:
 svcMgr += CfgMgr.MessageSvc( Format = "% F%50W%S%7W%R%T %0W%M",
                                  defaultLimit=1000000, OutputLevel =INFO)
 
-if not mboy and not segOnly and hasattr(topSequence.MuonCalibExtraTreeAlg, "Track2MELocation"):
-        topSequence.MuonCalibExtraTreeAlg.Track2MELocation=""
+#if not mboy and not segOnly and hasattr(topSequence.MuonCalibExtraTreeAlg, "Track2MELocation"):
+#        topSequence.MuonCalibExtraTreeAlg.Track2MELocation=""
   
 from AthenaCommon.ConfigurationShelve import saveToAscii
 saveToAscii("config.txt")

MuonSpectrometer/MuonCalib/MuonCalibJobTransforms/share/skeleton.mdt_calib_validate.py

@@ -77,12 +77,12 @@ elif (CalibSite == "MP_NEW"):
   MdtValidationAlg.WriterConnectionString = "oracle://oracle01.mppmu.mpg.de/ATLMPI.mppmu.mpg.de/ATLAS_MUONCALIB_WRITER"
 elif (CalibSite == "MI"):
 # Michigan
-  MdtValidationAlg.ConnectionString = "oracle://umors.grid.umich.edu/muoncal.grid.umich.edu/atlas_muoncalib_mich"
+  VlidationAlgalidationAlg.ConnectionString = "oracle://umors.grid.umich.edu/muoncal.grid.umich.edu/atlas_muoncalib_mich"
   MdtValidationAlg.WorkingSchema = "atlas_muoncalib_mich"
 elif (CalibSite == "MI_NEW"):
 # Michigan        
   MdtValidationAlg.ConnectionString = "oracle://umors.grid.umich.edu/muoncal.grid.umich.edu/ATLAS_MUONCALIB_READER"
-  MdtValidationAlg.WorkingSchema = "ATLAS_MUONCALIB_UMICH"
+  MdtValidationAlg.WorkingSchema = "ATLAS_MUONCALIB_UM_META"
   MdtValidationAlg.WriterConnectionString = "oracle://umors.grid.umich.edu/muoncal.grid.umich.edu/ATLAS_MUONCALIB_WRITER"
 elif (CalibSite == "RM"):
 # ROMA
@@ -90,9 +90,9 @@ elif (CalibSite == "RM"):
   MdtValidationAlg.WorkingSchema = "atlas_muoncalib_rome"
 elif (CalibSite == "RM_NEW"):
 # ROMA
-  MdtValidationAlg.ConnectionString = "oracle://atlas-oracle-01.roma1.infn.it/atlrome.roma1.infn.it/ATLAS_MUONCALIB_READER"
+  MdtValidationAlg.ConnectionString = "oracle://atlas-cluster.cr.cnaf.infn.it:1521/atlcnafsrv.cr.cnaf.infn.it/ATLAS_MUONCALIB_READER"
   MdtValidationAlg.WorkingSchema = "ATLAS_MUONCALIB_RM_META"
-  MdtValidationAlg.WriterConnectionString = "oracle://atlas-oracle-01.roma1.infn.it/atlrome.roma1.infn.it/ATLAS_MUONCALIB_WRITER" 
+  MdtValidationAlg.WriterConnectionString = "oracle://atlas-cluster.cr.cnaf.infn.it:1521/atlcnafsrv.cr.cnaf.infn.it/ATLAS_MUONCALIB_WRITER"
 
 MdtValidationAlg.GetLimits = 0
 MdtValidationAlg.MinSlope = 1.