MaM v1.4.6 (TrigHLTMonitoring-00-07-38)

	* doMaM_ExtractAndDumpConfigs is now usable
	* Few small bug fixes
	* MaM v1.4.6
	* tagging TrigHLTMonitoring-00-07-38


Former-commit-id: b43ed56c

Trigger/TrigMonitoring/TrigHLTMonitoring/python/MenuAwareMonitoring.py

@@ -1400,7 +1400,10 @@ class MenuAwareMonitoring:
         if output_json_filename == "":
             output_json_filename = "mam_defaults.json"
 
-        self.dump_local_config_to_json(output_json_filename,comment,default=1)
+        filename = output_json_filename
+        tempcomment = comment
+
+        self.dump_local_config_to_json(output_json_filename=filename,comment=tempcomment,default=1)
 
 
     def diff_json_files(self,input_default_config_file="",input_config_file="",output_json_filename="mam_diff_configs.json"):
@@ -1500,7 +1503,7 @@ class MenuAwareMonitoring:
 
         # if there are no local differences wrt the default, then we dump nothing and exit
         if diffed_global_info2 == {}:
-            print "No local differences have been found with respect to the default MCK ("+str(default_mck)+") for Athena version "+athena_version+"."
+            print "No local differences have been found with respect to the default configuration for Athena version "+athena_version+"."
             print "Nothing shall be dumped to json as a result."
             return
 

Trigger/TrigMonitoring/TrigHLTMonitoring/python/MenuAwareMonitoringStandalone.py

@@ -28,7 +28,7 @@ class MenuAwareMonitoringStandalone:
         and get the current default from the database (if it exists)."""
 
         # MaM code version
-        self.version = '1.4.5'
+        self.version = '1.4.6'
 
         # flag for setting whether to print out anything to screen or not
         self.print_output = True

Trigger/TrigMonitoring/TrigHLTMonitoring/python/scripts/MCKtoCOOLmanual.py

@@ -9,7 +9,7 @@ from PyCool import cool
 import os
 os.environ['MAM_CORAL_DBLOOKUP_PATH']='/det/tdaq/hlt/mam/authentication/'
 os.environ['MAM_CORAL_AUTH_PATH']=os.environ['MAM_CORAL_DBLOOKUP_PATH']
-from MenuAwareMonitoringStandalone import MenuAwareMonitoringStandalone
+from TrigHLTMonitoring.MenuAwareMonitoringStandalone import MenuAwareMonitoringStandalone
 from CoolConvUtilities.AtlCoolLib import indirectOpen
 
 parser = argparse.ArgumentParser(description="Store an MCK in COOL for a run or run range. If MCK = 0, the offline project and version to store as the tag can be specifed, otherwise, the tag is taken from the MCK info stored in the TriggerDB")

Trigger/TrigMonitoring/TrigHLTMonitoring/share/addMonTools.py

@@ -294,10 +294,10 @@ if HLTMonFlags.doMaM == True:
 
         # if dumping the tool configurations (as a .json file) has been requested, then do that here
         if HLTMonFlags.doMaM_ExtractAndDumpConfigs == True:
-            log.info("Will not attempt to doMaM_ExtractAndDumpConfigs, this function is yet to be debugged")
+            log.info("Will attempt to extract final trigger monitoring tool configurations and dump them to %s" % (HLTMonFlags.MaM_OutputJSON.StoredValue))
             # get updated configs for all tools, and dump them to HLTMonFlags.MaM_OutputJSON.StoredValue
-            # mam.get_current_local_info()
-            # mam.make_default_json(HLTMonFlags.MaM_OutputJSON.StoredValue,comment="Final job config")
+            mam.get_current_local_info()
+            mam.make_default_json(HLTMonFlags.MaM_OutputJSON.StoredValue,comment="Final job config")
 
 ############################################