cosmetic changes

1. update example AthMonitorAlgorithm to use new Monitored interface names
2. refactor fill() function to avoid code duplication

Control/AthenaMonitoring/AthenaMonitoring/AthMonitorAlgorithm.h

@@ -79,24 +79,24 @@ public:
     /**
      * Adds variables from an event to a group by name.
      * 
-     * At the end of the fillHistograms routine, one should save the monitored variables 
-     * to the group. This function wraps the process of getting the desired group by a 
-     * call to AthMonitorAlgorithm::getGroup() and a call to Monitored::Group::fill(), 
-     * which also disables the auto-fill feature to avoid double-filling. Note, users 
-     * should avoid using this specific function name in daughter classes.
-     * 
      * @param groupName The string name of the GenericMonitoringTool
      * @param variables Variables desired to be saved.
      * @return StatusCode
      */
     template <typename... T>
     void fill( const std::string& groupName, T&&... variables ) const {
-        Monitored::Group(getGroup(groupName),std::forward<T>(variables)...).fill();
+        fill(getGroup(groupName),std::forward<T>(variables)...);
     }
 
 
     /**
-     * Adds variables from an event to a group by object reference.
+     * Adds variables from an event to a group by the group's object reference.
+     * 
+     * At the end of the fillHistograms routine, one should save the monitored variables 
+     * to the group. This function wraps the process of getting the desired group by a 
+     * call to AthMonitorAlgorithm::getGroup() and a call to Monitored::Group::fill(), 
+     * which also disables the auto-fill feature to avoid double-filling. Note, users 
+     * should avoid using this specific function name in daughter classes.
      * 
      * @param groupHandle A reference of the GenericMonitoringTool to which add variables.
      * @param variables Variables desired to be saved

Control/AthenaMonitoring/python/ExampleMonitorAlgorithm.py

@@ -87,7 +87,8 @@ def ExampleMonitoringConfig(inputFlags):
 
     anotherGroup.defineHistogram('lbWithFilter;lbWithFilter',title='Lumi;lb;Events',
                                  path='top',xbins=1000,xmin=-0.5,xmax=999.5)
-
+    anotherGroup.defineHistogram('run;run',title='Run Number;run;Events',
+                                 path='top',xbins=1000000,xmin=-0.5,xmax=999999.5)
 
     ### STEP 6 ###
     # Finalize. The return value should be a tuple of the ComponentAccumulator

Control/AthenaMonitoring/src/ExampleMonitorAlgorithm.cxx

@@ -22,10 +22,10 @@ StatusCode ExampleMonitorAlgorithm::fillHistograms( const EventContext& ctx ) co
     using namespace Monitored;
 
     // Declare the quantities which should be monitored
-    auto lumiPerBCID = MonitoredScalar::declare<float>("lumiPerBCID",0.0);
-    auto lb = MonitoredScalar::declare<int>("lb",0);
-    auto run = MonitoredScalar::declare<int>("run",0);
-    auto random = MonitoredScalar::declare<float>("random",0.0);
+    auto lumiPerBCID = Monitored::Scalar<float>("lumiPerBCID",0.0);
+    auto lb = Monitored::Scalar<int>("lb",0);
+    auto run = Monitored::Scalar<int>("run",0);
+    auto random = Monitored::Scalar<float>("random",0.0);
     // Set the values of the monitored variables for the event
     lumiPerBCID = lbAverageInteractionsPerCrossing();
     lb = GetEventInfo(ctx)->lumiBlock();