LabelsDeflate only if needed (ATR-15812) (TrigServices-20-10-17)

	* TrigServices-20-10-17
	* src/HltEventLoopMgr.cxx: remove unnecessary histogram locks, fix some histogram binnings,
	LabelsDeflate only if needed (ATR-15812)

2017-02-06  Frank Winklmeier  <fwinkl@cern>
	* TrigServices-20-10-16
	* src/HltEventLoopMgr.cxx: Fix build failure (ATR-15756), Coverity fixes (17299, 111973)
	* src/THistSvcHLT.cxx: Fix gcc6 indentation warning

2017-01-27  Frank Winklmeier  <fwinkl@cern>
	* TrigServices-20-10-15
	* src/HltEventLoopMgr.cxx: Fix build failure due to Gaudi changes (ATR-15756)

HLT/Trigger/TrigControl/TrigServices/src/THistSvcHLT.cxx

@@ -1876,36 +1876,34 @@ void
 THistSvcHLT::copyFileLayout (TDirectory *dst, TDirectory *src) {
 
   if (m_log.level() <= MSG::DEBUG)
-    m_log << MSG::DEBUG
-	  << "copyFileLayout() to dst path: " << dst->GetPath () << endmsg;
-
-    // strip out URLs
-    TString path ((char*)strstr (dst->GetPath(), ":"));
-    path.Remove (0, 2);
-
-    src->cd (path);
-    TDirectory *cur_src_dir = gDirectory;
-
-    // loop over all keys in this directory
-    TList *key_list = cur_src_dir->GetListOfKeys ();
-    int n = key_list->GetEntries ();
-    for ( int j = 0; j < n; ++j ) {
-      TKey *k = (TKey*)key_list->At (j);
-      const std::string src_pathname = cur_src_dir->GetPath()
-                                     + std::string("/")
-                                     + k->GetName();
-      TObject *o=src->Get (src_pathname.c_str());
-
+    m_log << MSG::DEBUG << "copyFileLayout() to dst path: " << dst->GetPath () << endmsg;
+
+  // strip out URLs
+  TString path ((char*)strstr (dst->GetPath(), ":"));
+  path.Remove (0, 2);
+  
+  src->cd (path);
+  TDirectory *cur_src_dir = gDirectory;
+  
+  // loop over all keys in this directory
+  TList *key_list = cur_src_dir->GetListOfKeys ();
+  int n = key_list->GetEntries ();
+  for ( int j = 0; j < n; ++j ) {
+    TKey *k = (TKey*)key_list->At (j);
+    const std::string src_pathname = cur_src_dir->GetPath()
+      + std::string("/")
+      + k->GetName();
+    TObject *o=src->Get (src_pathname.c_str());
+    
     if ( o && o->IsA()->InheritsFrom ("TDirectory")) {
       if (m_log.level() <= MSG::VERBOSE)
-	m_log << MSG::VERBOSE << " subdir [" << o->GetName() << "]..."
-	      << endmsg;
-        dst->cd ();
-        TDirectory * dst_dir = dst->mkdir (o->GetName(), o->GetTitle());
+        m_log << MSG::VERBOSE << " subdir [" << o->GetName() << "]..." << endmsg;
+      dst->cd ();
+      TDirectory * dst_dir = dst->mkdir (o->GetName(), o->GetTitle());
       copyFileLayout (dst_dir, src);
-      }
-    } // loop over keys
-    return;
+    }
+  } // loop over keys
+  return;
 }
 
 //* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *//