Calorimeter/CaloExample/CaloRecEx/share/CaloRecOutputItemList_jobOptions.py

@@ -86,8 +86,8 @@ AODMoments=[#"LATERAL"
             ,"SECOND_LAMBDA"
             ,"CENTER_MAG"
             ,"CENTER_LAMBDA"
-            #,"FIRST_ENG_DENS"
-            #,"ENG_FRAC_MAX" 
+            ,"FIRST_ENG_DENS"
+            ,"ENG_FRAC_MAX" 
             ,"ISOLATION"
             ,"ENG_BAD_CELLS"
             ,"N_BAD_CELLS"

PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionTool.h

-// Dear emacs, this is -*- c++ -*-
-// $Id: CorrectionTool.h 600738 2014-06-07 14:34:05Z krasznaa $
-#ifndef PATINTERFACES_CORRECTIONTOOL_H
-#define PATINTERFACES_CORRECTIONTOOL_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
+#ifndef PATINTERFACES_CORRECTIONTOOL_H
+#define PATINTERFACES_CORRECTIONTOOL_H
 
-// Local include(s):
 #include "PATInterfaces/CorrectionCode.h"
 
 namespace CP {

PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/CorrectionTool.icc

-// Dear emacs, this is -*- c++ -*-
-// $Id: CorrectionTool.icc 600738 2014-06-07 14:34:05Z krasznaa $
-#ifndef PATINTERFACES_CORRECTIONTOOL_ICC
-#define PATINTERFACES_CORRECTIONTOOL_ICC
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
+#ifndef PATINTERFACES_CORRECTIONTOOL_ICC
+#define PATINTERFACES_CORRECTIONTOOL_ICC
 
-// System include(s):
 #include <memory>
 
 namespace CP {

PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/Global.h

-#ifndef PATINTERFACES_GLOBAL_H
-#define PATINTERFACES_GLOBAL_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/// @author Nils Krumnack
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef PATINTERFACES_GLOBAL_H
+#define PATINTERFACES_GLOBAL_H
 
 // This module still needs to be documented.  The interface provided
 // in this module is intended for experts only.  The module is

PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/ISystematicsTool.h

-// Dear emacs, this is -*- c++ -*-
-// $Id: ISystematicsTool.h 676499 2015-06-18 20:13:50Z sfarrell $
-#ifndef PATINTERFACES_ISYSTEMATICSTOOL_H
-#define PATINTERFACES_ISYSTEMATICSTOOL_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
-// System include(s):
+#ifndef PATINTERFACES_ISYSTEMATICSTOOL_H
+#define PATINTERFACES_ISYSTEMATICSTOOL_H
 
-// Framework include(s):
 #include "AsgTools/IAsgTool.h"
 
 // Local include(s):

PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MakeSystematicsVector.h

-#ifndef PATINTERFACES_MAKE_SYSTEMATICS_VECTOR_H
-#define PATINTERFACES_MAKE_SYSTEMATICS_VECTOR_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/// @author Nils Krumnack
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef PATINTERFACES_MAKE_SYSTEMATICS_VECTOR_H
+#define PATINTERFACES_MAKE_SYSTEMATICS_VECTOR_H
 
 #include <PATInterfaces/Global.h>
 

PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/MessageCheck.h

-#ifndef PAT_INTERFACES__MESSAGE_CHECK_H
-#define PAT_INTERFACES__MESSAGE_CHECK_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/// @author Nils Krumnack
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef PAT_INTERFACES__MESSAGE_CHECK_H
+#define PAT_INTERFACES__MESSAGE_CHECK_H
 
 
 #include <AsgTools/MessageCheck.h>

PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicSet.h

@@ -84,7 +84,7 @@ namespace CP
     void swap(SystematicSet& otherSet);
 
     /// description: clear the set
-    void clear() { return m_sysVariations.clear(); }
+    void clear();
 
   public:
     // Specialized search and filtering methods
@@ -173,11 +173,6 @@ namespace CP
     mutable std::size_t m_hash;
     mutable bool m_hashIsCached;
 
-    /// description: flags this set as already cached using
-    /// its current full set of systematics. Is set to false
-    /// when the set is modified.
-    //bool m_isCached;
-
   };
 
 

PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicVariation.h

-#ifndef PATINTERFACES_SYSTEMATIC_VARIATION_H
-#define PATINTERFACES_SYSTEMATIC_VARIATION_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/// @author Nils Krumnack
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
+#ifndef PATINTERFACES_SYSTEMATIC_VARIATION_H
+#define PATINTERFACES_SYSTEMATIC_VARIATION_H
 
 // This module implements a class that manages the various
 // representations of a single systematic variation.  The interface

PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsTool.h

-// Dear emacs, this is -*- c++ -*-
-// $Id: SystematicsTool.h 638687 2015-01-10 20:31:47Z sfarrell $
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
+
+
 #ifndef PATINTERFACES_SYSTEMATICS_TOOL_H
 #define PATINTERFACES_SYSTEMATICS_TOOL_H
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
 // System include(s):
 #include <unordered_map>
 

PhysicsAnalysis/AnalysisCommon/PATInterfaces/PATInterfaces/SystematicsUtil.h

-#ifndef PATINTERFACES_SYSTEMATICS_UTIL_H
-#define PATINTERFACES_SYSTEMATICS_UTIL_H
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
 
+#ifndef PATINTERFACES_SYSTEMATICS_UTIL_H
+#define PATINTERFACES_SYSTEMATICS_UTIL_H
 
 #include <PATInterfaces/Global.h>
 #include <vector>

PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/MakeSystematicsVector.cxx

-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
 
 //

PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/MessageCheck.cxx

-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
+/// @author Nils Krumnack
 
 
 //

PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicSet.cxx

@@ -45,12 +45,14 @@ namespace CP
   SystematicSet::SystematicSet(const std::string& systematics)
         : SystematicSet()
   {
-    std::string::size_type split = 0, split2 = 0;
-    while ((split = systematics.find ("-", split2)) != std::string::npos) {
+    if (!systematics.empty()) {
+      std::string::size_type split = 0, split2 = 0;
+      while ((split = systematics.find ("-", split2)) != std::string::npos) {
+        m_sysVariations.insert (systematics.substr (split2, split - split2));
+        split2 = split + 1;
+      }
       m_sysVariations.insert (systematics.substr (split2, split - split2));
-      split2 = split + 1;
     }
-    m_sysVariations.insert (systematics.substr (split2, split - split2));
   }
 
 
@@ -114,6 +116,16 @@ namespace CP
   }
 
 
+  // Clear the systematics and the rest of the state
+  void SystematicSet::clear()
+  {
+    m_sysVariations.clear();
+    m_joinedName.clear();
+    m_hash = 0;
+    m_nameIsCached = m_hashIsCached = false;
+  }
+
+
   // Match full systematic or continuous systematic
   bool SystematicSet::matchSystematic(const SystematicVariation& systematic,
                                       MATCHTYPE type) const

PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicVariation.cxx

-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
 
 //

PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicsTool.cxx

-// $Id: SystematicsTool.cxx 768505 2016-08-17 18:13:04Z ssnyder $
-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
 
-// System include(s):
+
+// $Id: SystematicsTool.cxx 768505 2016-08-17 18:13:04Z ssnyder $
 #include <iostream>
 
 // Infrastructure include(s):
@@ -21,7 +19,6 @@
 #include "PATInterfaces/SystematicRegistry.h"
 
 // Other include(s):
-//#include "boost/unordered_map.hpp"
 
 namespace CP {
 

PhysicsAnalysis/AnalysisCommon/PATInterfaces/Root/SystematicsUtil.cxx

-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
 
 //

PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/gt_SystematicSet.cxx

-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
 
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
+/// @author Nils Krumnack
 
 
 //
@@ -30,6 +27,20 @@ using namespace CP;
 #define ASSERT_FAILURE(x)			\
   ASSERT_EQ (asg::CheckHelper<decltype(x)>::failureCode(), x)
 
+TEST (SystematicSetTest, state_clear)
+{
+  SystematicVariation sys("TEST_VARIATION", 1);
+  SystematicSet set;
+  set.insert( SystematicVariation("TEST_VARIATION", 1) );
+  const std::string sysName = sys.name();
+  const std::string setName = set.name();
+  // First assert that the sys name matches the single-sys-set name
+  ASSERT_EQ( sysName, setName );
+  // Assert that the state is properly cleared
+  set.clear();
+  ASSERT_EQ( set.name(), std::string() );
+}
+
 TEST (SystematicSetTest, getToyVariation_empty)
 {
   SystematicSet set;

PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/inc_CorrectionCode.cxx

-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
 
 //

PhysicsAnalysis/AnalysisCommon/PATInterfaces/test/inc_SystematicCode.cxx

-//        
-//                  Author: Nils Krumnack
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-// Please feel free to contact me (nils.erik.krumnack@cern.ch) for bug
-// reports, feature suggestions, praise and complaints.
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
 
 
 //