undo the forced dictionary loading in xAOD::Init

Control/xAODRootAccess/Root/Init.cxx

@@ -69,14 +69,6 @@ namespace xAOD {
       ROOT::Cintex::Cintex::Enable();
 #endif // ROOT_VERSION
 
-#ifdef XAOD_STANDALONE
-      // Ensure the JetContainer dictionary is loaded.  This fixes an
-      // issue in the common CP algorithms where this dictionary is
-      // not always loaded in the correct order despite the code
-      // above.
-      gInterpreter->ProcessLine ("delete new xAOD::JetContainer;");
-#endif
-
       // Let the user know what happened:
       ::Info( appname, "Environment initialised for data access" );
 

PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/share/MetAnalysisAlgorithmsTest_eljob.py

@@ -25,6 +25,7 @@ parser.add_option( '-u', '--unit-test', dest='unit_test',
 import ROOT
 ROOT.xAOD.Init().ignore()
 ROOT.xAOD.LoadDictionaries().ignore()
+ROOT.xAOD.JetContainer ()
 
 # ideally we'd run over all of them, but we don't have a mechanism to
 # configure per-sample right now