merging upstream 21.0 changes

Former-commit-id: c66b30ccbd72db74c7b5c0d80a94adfe8ce3ea09

Calorimeter/CaloIdentifier/test/LArEM_ID_test.cxx

@@ -21,6 +21,15 @@
 #include "larem_id_test_common.cxx"
 
 
+class LArEM_ID_Test
+  : public LArEM_ID, public ILArEM_ID_Test
+{
+public:
+  virtual int get_lar_field_value() const override { return lar_field_value(); }
+  virtual int get_lar_em_field_value() const override { return lar_em_field_value(); }
+};
+
+
 void test_basic (const LArEM_Base_ID& idhelper)
 {
   std::cout << "test_basic\n";
@@ -68,8 +77,8 @@ void test4 (const LArEM_ID& em_id)
 
 int main()
 {
-  std::unique_ptr<LArEM_ID> idhelper = make_helper<LArEM_ID>();
-  std::unique_ptr<LArEM_ID> idhelper_n = make_helper<LArEM_ID>(true);
+  std::unique_ptr<LArEM_ID> idhelper = make_helper<LArEM_ID_Test>();
+  std::unique_ptr<LArEM_ID> idhelper_n = make_helper<LArEM_ID_Test>(true);
   try {
     test_basic (*idhelper);
     test_connected (*idhelper);

Calorimeter/CaloIdentifier/test/LArEM_SuperCell_ID_test.cxx

@@ -21,6 +21,15 @@
 #include "larem_id_test_common.cxx"
 
 
+class LArEM_SuperCell_ID_Test
+  : public LArEM_SuperCell_ID, public ILArEM_ID_Test
+{
+public:
+  virtual int get_lar_field_value() const override { return lar_field_value(); }
+  virtual int get_lar_em_field_value() const override { return lar_em_field_value(); }
+};
+
+
 void test_basic (const LArEM_Base_ID& idhelper)
 {
   std::cout << "test_basic\n";
@@ -70,8 +79,8 @@ void test4 (const LArEM_SuperCell_ID& /*em_id*/)
 
 int main()
 {
-  std::unique_ptr<LArEM_SuperCell_ID> idhelper = make_helper<LArEM_SuperCell_ID>();
-  std::unique_ptr<LArEM_SuperCell_ID> idhelper_n = make_helper<LArEM_SuperCell_ID>(true);
+  std::unique_ptr<LArEM_SuperCell_ID> idhelper = make_helper<LArEM_SuperCell_ID_Test>();
+  std::unique_ptr<LArEM_SuperCell_ID> idhelper_n = make_helper<LArEM_SuperCell_ID_Test>(true);
   try {
     test_basic (*idhelper);
     test_connected (*idhelper, true);

Calorimeter/CaloIdentifier/test/LArFCAL_ID_test.cxx

@@ -23,6 +23,15 @@
 #include "larfcal_id_test_common.cxx"
 
 
+class LArFCAL_ID_Test
+  : public LArFCAL_ID, public ILArFCAL_ID_Test
+{
+public:
+  virtual int get_lar_field_value() const override { return lar_field_value(); }
+  virtual int get_lar_fcal_field_value() const override { return lar_fcal_field_value(); }
+};
+
+
 // neighbors
 void test4 (const LArFCAL_ID& fcal_id)
 {
@@ -74,8 +83,8 @@ int main()
   idd.add_metadata("FCAL2DNEIGHBORS",     "FCal2DNeighbors-DC3-05-Comm-01.txt");  
   idd.add_metadata("FCAL3DNEIGHBORSNEXT", "FCal3DNeighborsNext-DC3-05-Comm-01.txt");  
   idd.add_metadata("FCAL3DNEIGHBORSPREV", "FCal3DNeighborsPrev-DC3-05-Comm-01.txt");  
-  std::unique_ptr<LArFCAL_ID> idhelper = make_helper<LArFCAL_ID>();
-  std::unique_ptr<LArFCAL_ID> idhelper_n = make_helper<LArFCAL_ID>(true);
+  std::unique_ptr<LArFCAL_ID> idhelper = make_helper<LArFCAL_ID_Test>();
+  std::unique_ptr<LArFCAL_ID> idhelper_n = make_helper<LArFCAL_ID_Test>(true);
   try {
     test_basic (*idhelper);
     test_connected (*idhelper, false);

Calorimeter/CaloIdentifier/test/LArFCAL_SuperCell_ID_test.cxx

@@ -23,6 +23,15 @@
 #include "larfcal_id_test_common.cxx"
 
 
+class LArFCAL_SuperCell_ID_Test
+  : public LArFCAL_SuperCell_ID, public ILArFCAL_ID_Test
+{
+public:
+  virtual int get_lar_field_value() const override { return lar_field_value(); }
+  virtual int get_lar_fcal_field_value() const override { return lar_fcal_field_value(); }
+};
+
+
 void test_basic (const LArFCAL_SuperCell_ID& idhelper)
 {
   std::cout << "test_basic\n";
@@ -39,7 +48,7 @@ void test_basic (const LArFCAL_SuperCell_ID& idhelper)
 
 int main()
 {
-  std::unique_ptr<LArFCAL_SuperCell_ID> idhelper = make_helper<LArFCAL_SuperCell_ID>();
+  std::unique_ptr<LArFCAL_SuperCell_ID> idhelper = make_helper<LArFCAL_SuperCell_ID_Test>();
   try {
     test_basic (*idhelper);
     test_connected (*idhelper, true);

Calorimeter/CaloIdentifier/test/LArHEC_ID_test.cxx

@@ -21,6 +21,15 @@
 #include "larhec_id_test_common.cxx"
 
 
+class LArHEC_ID_Test
+  : public LArHEC_ID, public ILArHEC_ID_Test
+{
+public:
+  virtual int get_lar_field_value() const override { return lar_field_value(); }
+  virtual int get_lar_hec_field_value() const override { return lar_hec_field_value(); }
+};
+
+
 void test_basic (const LArHEC_ID& idhelper)
 {
   std::cout << "test_basic\n";
@@ -67,8 +76,8 @@ void test_neighbors (const LArHEC_ID& idhelper)
 
 int main()
 {
-  std::unique_ptr<LArHEC_ID> idhelper = make_helper<LArHEC_ID>();
-  std::unique_ptr<LArHEC_ID> idhelper_n = make_helper<LArHEC_ID>(true);
+  std::unique_ptr<LArHEC_ID> idhelper = make_helper<LArHEC_ID_Test>();
+  std::unique_ptr<LArHEC_ID> idhelper_n = make_helper<LArHEC_ID_Test>(true);
   try {
     test_basic (*idhelper);
     test_connected (*idhelper, false);

Calorimeter/CaloIdentifier/test/LArHEC_SuperCell_ID_test.cxx

@@ -21,6 +21,15 @@
 #include "larhec_id_test_common.cxx"
 
 
+class LArHEC_SuperCell_ID_Test
+  : public LArHEC_SuperCell_ID, public ILArHEC_ID_Test
+{
+public:
+  virtual int get_lar_field_value() const override { return lar_field_value(); }
+  virtual int get_lar_hec_field_value() const override { return lar_hec_field_value(); }
+};
+
+
 void test_basic (const LArHEC_Base_ID& idhelper)
 {
   std::cout << "test_basic\n";
@@ -65,8 +74,8 @@ void test_neighbors (const LArHEC_SuperCell_ID& idhelper)
 
 int main()
 {
-  std::unique_ptr<LArHEC_SuperCell_ID> idhelper = make_helper<LArHEC_SuperCell_ID>();
-  std::unique_ptr<LArHEC_SuperCell_ID> idhelper_n = make_helper<LArHEC_SuperCell_ID>(true);
+  std::unique_ptr<LArHEC_SuperCell_ID> idhelper = make_helper<LArHEC_SuperCell_ID_Test>();
+  std::unique_ptr<LArHEC_SuperCell_ID> idhelper_n = make_helper<LArHEC_SuperCell_ID_Test>(true);
   try {
     test_basic (*idhelper);
     test_connected (*idhelper, true);

Calorimeter/CaloIdentifier/test/LArMiniFCAL_ID_test.cxx

@@ -22,12 +22,20 @@
 #include "make_idhelper_common.cxx"
 
 
+class ILArMiniFCAL_ID_Test
+{
+public:
+  virtual int get_lar_field_value() const = 0;
+  virtual int get_lar_fcal_field_value() const = 0;
+};
+
+
 class LArMiniFCAL_ID_Test
-  : public LArMiniFCAL_ID
+  : public LArMiniFCAL_ID, public ILArMiniFCAL_ID_Test
 {
 public:
-  using LArMiniFCAL_ID::lar_field_value;
-  using LArMiniFCAL_ID::lar_fcal_field_value;
+  virtual int get_lar_field_value() const override { return lar_field_value(); }
+  virtual int get_lar_fcal_field_value() const override { return lar_fcal_field_value(); }
 };
 
 
@@ -131,9 +139,9 @@ void test_connected (const LArMiniFCAL_ID& idhelper)
     counts.count (depth);
 
     ExpandedIdentifier exp_id;
-    LArMiniFCAL_ID_Test* idhelper_test = (LArMiniFCAL_ID_Test*)&idhelper;
-    exp_id << idhelper_test->lar_field_value()
-      	   << idhelper_test->lar_fcal_field_value()
+    const ILArMiniFCAL_ID_Test& idhelper_test = dynamic_cast<const ILArMiniFCAL_ID_Test&>(idhelper);
+    exp_id << idhelper_test.get_lar_field_value()
+      	   << idhelper_test.get_lar_fcal_field_value()
 	   << idhelper.pos_neg(id)
 	   << idhelper.module(id)
 	   << idhelper.depth(id)
@@ -161,9 +169,9 @@ void test_connected (const LArMiniFCAL_ID& idhelper)
     assert (id == idhelper.module_id (side, mod));
 
     ExpandedIdentifier exp_id;
-    LArMiniFCAL_ID_Test* idhelper_test = (LArMiniFCAL_ID_Test*)&idhelper;
-    exp_id << idhelper_test->lar_field_value()
-      	   << idhelper_test->lar_fcal_field_value()
+    const ILArMiniFCAL_ID_Test& idhelper_test = dynamic_cast<const ILArMiniFCAL_ID_Test&>(idhelper);
+    exp_id << idhelper_test.get_lar_field_value()
+      	   << idhelper_test.get_lar_fcal_field_value()
 	   << idhelper.pos_neg(id)
 	   << idhelper.module(id)
 	   << idhelper.depth(id);
@@ -239,8 +247,8 @@ int main()
   idd.add_metadata("FCAL3DNEIGHBORSNEXT", "FCal3DNeighborsNext-DC3-05-Comm-01.txt");  
   idd.add_metadata("FCAL3DNEIGHBORSPREV", "FCal3DNeighborsPrev-DC3-05-Comm-01.txt");  
 
-  std::unique_ptr<LArMiniFCAL_ID> idhelper = make_helper<LArMiniFCAL_ID>();
-  std::unique_ptr<LArMiniFCAL_ID> idhelper_n = make_helper<LArMiniFCAL_ID>(true);
+  std::unique_ptr<LArMiniFCAL_ID> idhelper = make_helper<LArMiniFCAL_ID_Test>();
+  std::unique_ptr<LArMiniFCAL_ID> idhelper_n = make_helper<LArMiniFCAL_ID_Test>(true);
   try {
     test_basic (*idhelper);
     test_connected (*idhelper);

Calorimeter/CaloIdentifier/test/TileID_test.cxx

@@ -21,9 +21,17 @@
 #include "tile_id_test_common.cxx"
 
 
+class TileID_Test
+  : public TileID, public ITile_ID_Test
+{
+public:
+  virtual int get_tile_field_value() const override { return tile_field_value(); }
+};
+
+
 std::unique_ptr<TileID> make_helper (bool do_neighbours = false)
 {
-  auto idhelper = CxxUtils::make_unique<TileID>();
+  auto idhelper = CxxUtils::make_unique<TileID_Test>();
   IdDictParser parser;
   parser.register_external_entity ("TileCalorimeter",
                                    "IdDictTileCalorimeter.xml");
@@ -99,8 +107,8 @@ int main()
   idDictXmlFile = "IdDictTileCalorimeter.xml";
   IdDictMgr& idd = getDictMgr();
   idd.add_metadata("TILENEIGHBORS",       "TileNeighbour_reduced.txt");  
-  std::unique_ptr<TileID> idhelper = make_helper<TileID>();
-  std::unique_ptr<TileID> idhelper_n = make_helper<TileID>(true);
+  std::unique_ptr<TileID> idhelper = make_helper<TileID_Test>();
+  std::unique_ptr<TileID> idhelper_n = make_helper<TileID_Test>(true);
   try {
     test_basic (*idhelper);
     test_connected (*idhelper, false);

Calorimeter/CaloIdentifier/test/Tile_SuperCell_ID_test.cxx

@@ -21,6 +21,14 @@
 #include "tile_id_test_common.cxx"
 
 
+class Tile_SuperCell_ID_Test
+  : public Tile_SuperCell_ID, public ITile_ID_Test
+{
+public:
+  virtual int get_tile_field_value() const override { return tile_field_value(); }
+};
+
+
 void test_basic (const Tile_SuperCell_ID& idhelper)
 {
   std::cout << "test_basic\n";
@@ -45,7 +53,7 @@ int main()
 {
   idDictType = "TileCalorimeter";
   idDictXmlFile = "IdDictTileCalorimeter.xml";
-  std::unique_ptr<Tile_SuperCell_ID> idhelper = make_helper<Tile_SuperCell_ID>();
+  std::unique_ptr<Tile_SuperCell_ID> idhelper = make_helper<Tile_SuperCell_ID_Test>();
   try {
     test_basic (*idhelper);
     test_connected (*idhelper, true);

Calorimeter/CaloIdentifier/test/larem_id_test_common.cxx

@@ -13,7 +13,6 @@
  */
 
 
-#include "boost/foreach.hpp"
 #include "make_idhelper_common.cxx"
 
 
@@ -31,12 +30,11 @@ void basic_print_id (const LArEM_Base_ID& idhelper, const Identifier& id)
 }
 
 
-class LArEM_ID_Test
-  : public LArEM_Base_ID
+class ILArEM_ID_Test
 {
 public:
-  using LArEM_Base_ID::lar_field_value;
-  using LArEM_Base_ID::lar_em_field_value;
+  virtual int get_lar_field_value() const = 0;
+  virtual int get_lar_em_field_value() const = 0;
 };
 
 
@@ -176,9 +174,9 @@ void test_connected (const LArEM_Base_ID& em_id, bool supercell = false)
     counts.count (bec, samp);
 
     ExpandedIdentifier exp_id;
-    LArEM_ID_Test* em_id_test = (LArEM_ID_Test*)&em_id;
-    exp_id << em_id_test->lar_field_value()
-      	   << em_id_test->lar_em_field_value()
+    const ILArEM_ID_Test& em_id_test = dynamic_cast<const ILArEM_ID_Test&>(em_id);
+    exp_id << em_id_test.get_lar_field_value()
+      	   << em_id_test.get_lar_em_field_value()
 	   << em_id.barrel_ec(ch_id)
 	   << em_id.sampling(ch_id)
 	   << em_id.region(ch_id)
@@ -190,11 +188,7 @@ void test_connected (const LArEM_Base_ID& em_id, bool supercell = false)
   for (size_t i = 0; i < hashvec.size(); i++)
     assert (hashvec[i]);
 
-#if __cplusplus > 201100
   for (Identifier ch_id : em_id.em_range()) {
-#else
-  BOOST_FOREACH (Identifier ch_id, em_id.em_range()) {
-#endif
     hashsum -= em_id.channel_hash (ch_id);
   }
   assert (hashsum == 0);
@@ -238,9 +232,9 @@ void test_connected (const LArEM_Base_ID& em_id, bool supercell = false)
     hashvec[regHash] = true;
 
     ExpandedIdentifier exp_id;
-    LArEM_ID_Test* em_id_test = (LArEM_ID_Test*)&em_id;
-    exp_id << em_id_test->lar_field_value()
-      	   << em_id_test->lar_em_field_value()
+    const ILArEM_ID_Test& em_id_test = dynamic_cast<const ILArEM_ID_Test&>(em_id);
+    exp_id << em_id_test.get_lar_field_value()
+      	   << em_id_test.get_lar_em_field_value()
 	   << em_id.barrel_ec(reg_id)
 	   << em_id.sampling(reg_id)
 	   << em_id.region(reg_id);
@@ -249,11 +243,7 @@ void test_connected (const LArEM_Base_ID& em_id, bool supercell = false)
   for (size_t i = 0; i < hashvec.size(); i++)
     assert (hashvec[i]);
 
-#if __cplusplus > 201100
   for (Identifier ch_id : em_id.reg_range()) {
-#else
-  BOOST_FOREACH (Identifier ch_id, em_id.reg_range()) {
-#endif
     hashsum -= em_id.region_hash (ch_id);
   }
   assert (hashsum == 0);

Calorimeter/CaloIdentifier/test/larfcal_id_test_common.cxx

@@ -31,12 +31,11 @@ void basic_print_id (const LArFCAL_Base_ID& idhelper, const Identifier& id)
 }
 
 
-class LArFCAL_ID_Test
-  : public LArFCAL_Base_ID
+class ILArFCAL_ID_Test
 {
 public:
-  using LArFCAL_Base_ID::lar_field_value;
-  using LArFCAL_Base_ID::lar_fcal_field_value;
+  virtual int get_lar_field_value() const = 0;
+  virtual int get_lar_fcal_field_value() const = 0;
 };
 
 
@@ -135,9 +134,9 @@ test_connected (const LArFCAL_Base_ID& fcal_id, bool supercell = false)
     counts.count (mod);
 
     ExpandedIdentifier exp_id;
-    LArFCAL_ID_Test* fcal_id_test = (LArFCAL_ID_Test*)&fcal_id;
-    exp_id << fcal_id_test->lar_field_value()
-      	   << fcal_id_test->lar_fcal_field_value()
+    const ILArFCAL_ID_Test& fcal_id_test = dynamic_cast<const ILArFCAL_ID_Test&>(fcal_id);
+    exp_id << fcal_id_test.get_lar_field_value()
+      	   << fcal_id_test.get_lar_fcal_field_value()
 	   << fcal_id.pos_neg(ch_id)
 	   << fcal_id.module(ch_id)
            << fcal_id.eta(ch_id)
@@ -196,9 +195,9 @@ test_connected (const LArFCAL_Base_ID& fcal_id, bool supercell = false)
     hashvec[modHash] = true;
 
     ExpandedIdentifier exp_id;
-    LArFCAL_ID_Test* fcal_id_test = (LArFCAL_ID_Test*)&fcal_id;
-    exp_id << fcal_id_test->lar_field_value()
-      	   << fcal_id_test->lar_fcal_field_value()
+    const ILArFCAL_ID_Test& fcal_id_test = dynamic_cast<const ILArFCAL_ID_Test&>(fcal_id);
+    exp_id << fcal_id_test.get_lar_field_value()
+      	   << fcal_id_test.get_lar_fcal_field_value()
 	   << fcal_id.pos_neg(mod_id)
 	   << fcal_id.module(mod_id);
     assert (fcal_id.module_id (exp_id) == mod_id);

Calorimeter/CaloIdentifier/test/larhec_id_test_common.cxx

@@ -32,12 +32,11 @@ void basic_print_id (const LArHEC_Base_ID& idhelper, const Identifier& id)
 }
 
 
-class LArHEC_ID_Test
-  : public LArHEC_Base_ID
+class ILArHEC_ID_Test
 {
 public:
-  using LArHEC_Base_ID::lar_field_value;
-  using LArHEC_Base_ID::lar_hec_field_value;
+  virtual int get_lar_field_value() const = 0;
+  virtual int get_lar_hec_field_value() const = 0;
 };
 
 
@@ -122,9 +121,9 @@ void test_connected (const LArHEC_Base_ID& idhelper, bool supercell)
     counts.count (reg, samp);
 
     ExpandedIdentifier exp_id;
-    LArHEC_ID_Test* idhelper_test = (LArHEC_ID_Test*)&idhelper;
-    exp_id << idhelper_test->lar_field_value()
-      	   << idhelper_test->lar_hec_field_value()
+    const ILArHEC_ID_Test& idhelper_test = dynamic_cast<const ILArHEC_ID_Test&>(idhelper);
+    exp_id << idhelper_test.get_lar_field_value()
+      	   << idhelper_test.get_lar_hec_field_value()
 	   << idhelper.pos_neg(id)
 	   << idhelper.sampling(id)
 	   << idhelper.region(id)
@@ -157,9 +156,9 @@ void test_connected (const LArHEC_Base_ID& idhelper, bool supercell)
     assert (id == id2);
 
     ExpandedIdentifier exp_id;
-    LArHEC_ID_Test* idhelper_test = (LArHEC_ID_Test*)&idhelper;
-    exp_id << idhelper_test->lar_field_value()
-      	   << idhelper_test->lar_hec_field_value()
+    const ILArHEC_ID_Test& idhelper_test = dynamic_cast<const ILArHEC_ID_Test&>(idhelper);
+    exp_id << idhelper_test.get_lar_field_value()
+      	   << idhelper_test.get_lar_hec_field_value()
 	   << idhelper.pos_neg(id)
 	   << idhelper.sampling(id)
 	   << idhelper.region(id);

Calorimeter/CaloIdentifier/test/tile_id_test_common.cxx

@@ -31,11 +31,10 @@ void basic_print_id (const Tile_Base_ID& idhelper, const Identifier& id)
 }
 
 
-class Tile_ID_Test
-  : public Tile_Base_ID
+class ITile_ID_Test
 {
 public:
-  using Tile_Base_ID::tile_field_value;
+  virtual int get_tile_field_value() const = 0;
 };
 
 
@@ -202,8 +201,8 @@ void test_connected (const Tile_Base_ID& idhelper, bool supercell)
     counts.count (sect, samp);
 
     ExpandedIdentifier exp_id;
-    Tile_ID_Test* idhelper_test = (Tile_ID_Test*)&idhelper;
-    exp_id << idhelper_test->tile_field_value()
+    const ITile_ID_Test& idhelper_test = dynamic_cast<const ITile_ID_Test&>(idhelper);
+    exp_id << idhelper_test.get_tile_field_value()
            << (idhelper.section(id) + (supercell ? Tile_Base_ID::SUPERCELL_MASK : 0))
 	   << idhelper.side(id)
 	   << idhelper.module(id)
@@ -228,8 +227,8 @@ void test_connected (const Tile_Base_ID& idhelper, bool supercell)
     assert (!idhelper.module_id (reg_id, 100, id2));
 
     ExpandedIdentifier exp_id;
-    Tile_ID_Test* idhelper_test = (Tile_ID_Test*)&idhelper;
-    exp_id << idhelper_test->tile_field_value()
+    const ITile_ID_Test& idhelper_test = dynamic_cast<const ITile_ID_Test&>(idhelper);
+    exp_id << idhelper_test.get_tile_field_value()
            << (idhelper.section(id) + (supercell ? Tile_Base_ID::SUPERCELL_MASK : 0))
 	   << idhelper.side(id)
 	   << idhelper.module(id);
@@ -252,8 +251,8 @@ void test_connected (const Tile_Base_ID& idhelper, bool supercell)
     assert (!idhelper.tower_id (reg_id, mod, 100, id2));
 
     ExpandedIdentifier exp_id;
-    Tile_ID_Test* idhelper_test = (Tile_ID_Test*)&idhelper;
-    exp_id << idhelper_test->tile_field_value()
+    const ITile_ID_Test& idhelper_test = dynamic_cast<const ITile_ID_Test&>(idhelper);
+    exp_id << idhelper_test.get_tile_field_value()
            << (idhelper.section(id) + (supercell ? Tile_Base_ID::SUPERCELL_MASK : 0))
 	   << idhelper.side(id)
 	   << idhelper.module(id)
@@ -271,8 +270,8 @@ void test_connected (const Tile_Base_ID& idhelper, bool supercell)
     assert (!idhelper.pmt_id (cell_id, 2, id2));
 
     ExpandedIdentifier exp_id;
-    Tile_ID_Test* idhelper_test = (Tile_ID_Test*)&idhelper;
-    exp_id << idhelper_test->tile_field_value()
+    const ITile_ID_Test& idhelper_test = dynamic_cast<const ITile_ID_Test&>(idhelper);
+    exp_id << idhelper_test.get_tile_field_value()
            << (idhelper.section(id) + (supercell ? Tile_Base_ID::SUPERCELL_MASK : 0))
 	   << idhelper.side(id)
 	   << idhelper.module(id)
@@ -330,8 +329,8 @@ void test_connected (const Tile_Base_ID& idhelper, bool supercell)
     region_check (idhelper, id);
 
     ExpandedIdentifier exp_id;
-    Tile_ID_Test* idhelper_test = (Tile_ID_Test*)&idhelper;
-    exp_id << idhelper_test->tile_field_value()
+    const ITile_ID_Test& idhelper_test = dynamic_cast<const ITile_ID_Test&>(idhelper);
+    exp_id << idhelper_test.get_tile_field_value()
            << (idhelper.section(id) + (supercell ? Tile_Base_ID::SUPERCELL_MASK : 0))
 	   << idhelper.side(id)
 	   << idhelper.module(id)
@@ -364,8 +363,8 @@ void test_connected (const Tile_Base_ID& idhelper, bool supercell)
             idhelper.phi_max(id));
 
     ExpandedIdentifier exp_id;
-    Tile_ID_Test* idhelper_test = (Tile_ID_Test*)&idhelper;
-    exp_id << idhelper_test->tile_field_value()
+    const ITile_ID_Test& idhelper_test = dynamic_cast<const ITile_ID_Test&>(idhelper);
+    exp_id << idhelper_test.get_tile_field_value()
            << (idhelper.section(id) + (supercell ? Tile_Base_ID::SUPERCELL_MASK : 0))
 	   << idhelper.side(id);
     assert (idhelper.region_id (exp_id) == id);

Calorimeter/CaloMonitoring/share/CaloBaselineMon_jobOpt.py

@@ -36,7 +36,7 @@ if rec.triggerStream()=='CosmicCalo':
 
 if rec.triggerStream()=='ZeroBias':
   tmp_CaloBaselineMon["bcidtoolMon_BCIDmax"] = 144
-  tmp_CaloBaselineMon["TriggerChain"] = ""
+  tmp_CaloBaselineMon["TriggerChain"] = "HLT_noalg_zb_L1ZB"
 
 CaloBaseline = CaloBaselineMon(
    name           = "CaloBaseline",

Calorimeter/CaloUtils/CMakeLists.txt

@@ -83,12 +83,12 @@ atlas_add_test( CaloVertexedCluster_test
 
 atlas_add_test( CaloTowerStore_test
    SCRIPT test/CaloTowerStore_test.sh
-   EXTRA_PATTERNS "[0-9] [A-Z]+ 20[123][0-9]|Reading file|^CORAL/Services/ConnectionService (Info|Warning)|^RelationalDatabase Info|^Data source lookup|^DetDescrCnvSvc +INFO|^CORAL/RelationalPlugins/frontier Info|^PluginManager Info|^RalSessionMgr Warning|^DBReplicaSvc +INFO|IOVDbSvc +INFO|^Py:Athena +INFO|^EventInfoMgtInit: Got release|^TEnvRec::ChangeValue|^PoolSvc +INFO|^PoolSvc +WARNING Unable to locate catalog|being retired|including file|Deaccess DbDatabase|^IoComponentMgr +INFO|File version|Global positioning|^Domain|duplicate entry|already loaded|RootDbase: all good|frontier.c|^Py:ConfigurableDb +(WARNING|INFO)|ApplicationMgr +INFO|INFO [sS]top|^CaloIdMgrDetDes.*INFO|^TTOnlineIDDetDe.*INFO|^CaloIDHelper_ID.*INFO|^AtlasDetectorID +INFO|^AthenaEventLoopMgrWARNING|^CaloDM_IDDetDes.*INFO|^CaloLVL1_IDDetD.*INFO|^LArFCAL_ID +INFO|^LArMiniFCAL_IDD.*INFO|^LArHEC_ID +INFO|^LArMiniFCAL_ID +INFO|TileTBIdDetDesc.*INFO|^TileIDDetDescrCnv +INFO|CaloCell_IDDetD.*INFO|TileID +INFO|^LArFCAL_IDDetDe.*INFO|^TileTBIDDetDesc.*INFO|^LArEM_ID +INFO|^LArHEC_IDDetDes.*INFO|^LArEM_IDDetDesc.*INFO|^EndcapDMConst.*INFO|^GeoModelSvc +INFO|USHAPE|U-shape|XMLFileCatalog Info|No IOVSvcTool associated|^RalSessionMgr Info|RDBMS technology|INFO Found unknown streamer checksum|^GUID: Class pool::DbString has GUID|^AthenaRootStrea.* INFO|INFO TileDddbManager"
+   EXTRA_PATTERNS "[0-9] [A-Z]+ 20[123][0-9]|Reading file|^CORAL/Services/ConnectionService (Info|Warning)|^RelationalDatabase Info|^Data source lookup|^DetDescrCnvSvc +INFO|^CORAL/RelationalPlugins/frontier Info|^PluginManager Info|^RalSessionMgr Warning|^DBReplicaSvc +INFO|IOVDbSvc +INFO|^Py:Athena +INFO|^EventInfoMgtInit: Got release|^TEnvRec::ChangeValue|^PoolSvc +INFO|^PoolSvc +WARNING Unable to locate catalog|being retired|including file|Deaccess DbDatabase|^IoComponentMgr +INFO|File version|Global positioning|^Domain|duplicate entry|already loaded|RootDbase: all good|frontier.c|^Py:ConfigurableDb +(WARNING|INFO)|ApplicationMgr +INFO|INFO [sS]top|^CaloIdMgrDetDes.*INFO|^TTOnlineIDDetDe.*INFO|^CaloIDHelper_ID.*INFO|^AtlasDetectorID +INFO|^AthenaEventLoopMgrWARNING|^CaloDM_IDDetDes.*INFO|^CaloLVL1_IDDetD.*INFO|^LArFCAL_ID +INFO|^LArMiniFCAL_IDD.*INFO|^LArHEC_ID +INFO|^LArMiniFCAL_ID +INFO|TileTBIdDetDesc.*INFO|^TileIDDetDescrCnv +INFO|CaloCell_IDDetD.*INFO|TileID +INFO|^LArFCAL_IDDetDe.*INFO|^TileTBIDDetDesc.*INFO|^LArEM_ID +INFO|^LArHEC_IDDetDes.*INFO|^LArEM_IDDetDesc.*INFO|^EndcapDMConst.*INFO|^GeoModelSvc +INFO|USHAPE|U-shape|XMLFileCatalog Info|No IOVSvcTool associated|^RalSessionMgr Info|RDBMS technology|INFO Found unknown streamer checksum|^GUID: Class pool::DbString has GUID|^AthenaRootStrea.* INFO|INFO TileDddbManager|oracle Info"
    PROPERTIES TIMEOUT 500 )
 
 atlas_add_test( CaloTowerBuilderTool_test
    SCRIPT test/CaloTowerBuilderTool_test.sh
-   EXTRA_PATTERNS "[0-9] [A-Z]+ 20[123][0-9]|Reading file|^CORAL/Services/ConnectionService (Info|Warning)|^RelationalDatabase Info|^Data source lookup|^DetDescrCnvSvc +INFO|^CORAL/RelationalPlugins/frontier Info|^PluginManager Info|^RalSessionMgr Warning|^DBReplicaSvc +INFO|IOVDbSvc +INFO|^Py:Athena +INFO|^EventInfoMgtInit: Got release|^TEnvRec::ChangeValue|^PoolSvc +INFO|^PoolSvc +WARNING Unable to locate catalog|being retired|including file|Deaccess DbDatabase|^IoComponentMgr +INFO|File version|Global positioning|^Domain|duplicate entry|already loaded|RootDbase: all good|frontier.c|^Py:ConfigurableDb +(WARNING|INFO)|ApplicationMgr +INFO|INFO [sS]top|^CaloIdMgrDetDes.*INFO|^TTOnlineIDDetDe.*INFO|^CaloIDHelper_ID.*INFO|^AtlasDetectorID +INFO|^AthenaEventLoopMgrWARNING|^CaloDM_IDDetDes.*INFO|^CaloLVL1_IDDetD.*INFO|^LArFCAL_ID +INFO|^LArMiniFCAL_IDD.*INFO|^LArHEC_ID +INFO|^LArMiniFCAL_ID +INFO|TileTBIdDetDesc.*INFO|^TileIDDetDescrCnv +INFO|CaloCell_IDDetD.*INFO|TileID +INFO|^LArFCAL_IDDetDe.*INFO|^TileTBIDDetDesc.*INFO|^LArEM_ID +INFO|^LArHEC_IDDetDes.*INFO|^LArEM_IDDetDesc.*INFO|^EndcapDMConstru.*INFO|^GeoModelSvc +INFO|USHAPE|U-shape|XMLFileCatalog Info|No IOVSvcTool associated|^RalSessionMgr Info|RDBMS technology|INFO Found unknown streamer checksum|^GUID: Class pool::DbString has GUID|^AthenaRootStrea.* INFO|INFO TileDddbManager"
+   EXTRA_PATTERNS "[0-9] [A-Z]+ 20[123][0-9]|Reading file|^CORAL/Services/ConnectionService (Info|Warning)|^RelationalDatabase Info|^Data source lookup|^DetDescrCnvSvc +INFO|^CORAL/RelationalPlugins/frontier Info|^PluginManager Info|^RalSessionMgr Warning|^DBReplicaSvc +INFO|IOVDbSvc +INFO|^Py:Athena +INFO|^EventInfoMgtInit: Got release|^TEnvRec::ChangeValue|^PoolSvc +INFO|^PoolSvc +WARNING Unable to locate catalog|being retired|including file|Deaccess DbDatabase|^IoComponentMgr +INFO|File version|Global positioning|^Domain|duplicate entry|already loaded|RootDbase: all good|frontier.c|^Py:ConfigurableDb +(WARNING|INFO)|ApplicationMgr +INFO|INFO [sS]top|^CaloIdMgrDetDes.*INFO|^TTOnlineIDDetDe.*INFO|^CaloIDHelper_ID.*INFO|^AtlasDetectorID +INFO|^AthenaEventLoopMgrWARNING|^CaloDM_IDDetDes.*INFO|^CaloLVL1_IDDetD.*INFO|^LArFCAL_ID +INFO|^LArMiniFCAL_IDD.*INFO|^LArHEC_ID +INFO|^LArMiniFCAL_ID +INFO|TileTBIdDetDesc.*INFO|^TileIDDetDescrCnv +INFO|CaloCell_IDDetD.*INFO|TileID +INFO|^LArFCAL_IDDetDe.*INFO|^TileTBIDDetDesc.*INFO|^LArEM_ID +INFO|^LArHEC_IDDetDes.*INFO|^LArEM_IDDetDesc.*INFO|^EndcapDMConstru.*INFO|^GeoModelSvc +INFO|USHAPE|U-shape|XMLFileCatalog Info|No IOVSvcTool associated|^RalSessionMgr Info|RDBMS technology|INFO Found unknown streamer checksum|^GUID: Class pool::DbString has GUID|^AthenaRootStrea.* INFO|INFO TileDddbManager|oracle Info"
    PROPERTIES TIMEOUT 500 )
 
 # Install files from the package:

Control/AthAllocators/CMakeLists.txt

@@ -56,6 +56,6 @@ _simple_test( ArenaSharedHeapSTLAllocator_test )
 
 atlas_add_test( DataPool_test
    SOURCES test/DataPool_test.cxx
-   LINK_LIBRARIES GaudiKernel TestTools AthAllocators
+   LINK_LIBRARIES GaudiKernel TestTools AthAllocators CxxUtils
    EXTRA_PATTERNS "^IncidentSvc +DEBUG Adding|^HistogramPersis.* (INFO|DEBUG)|^JobOptionsSvc +INFO|DEBUG Property update for OutputLevel"
    ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )

Control/AthAllocators/test/ArenaHandleBaseAllocT_test.cxx

@@ -52,8 +52,8 @@ public:
 void test1()
 {
   SG::ArenaHeader head;
-  TestAlloc::Params params;
-  params.name = "foo";
+  typedef typename TestAlloc::initParams<int> defaultParams_t;
+  TestAlloc::Params params = defaultParams_t (1000, "foo");
   TestHandle hand (&head, TestHandle::Creator (static_cast<TestAlloc*>(0),
                                                params));
   assert (hand.params().name == "foo");

Control/AthAllocators/test/DataPool_test.cxx

@@ -8,6 +8,8 @@
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/IChronoStatSvc.h"
 #include "TestTools/initGaudi.h"
+#include "CxxUtils/ubsan_suppress.h"
+#include "boost/format.hpp"
 
 #include <cassert>
 #include <iostream>
@@ -45,6 +47,8 @@ class Fluff
 
 int main ()
 {
+        CxxUtils::ubsan_suppress ([]() { boost::format("%1%") % "asd"; });
+
 
 	ISvcLocator* pSvcLoc;
 	if (!Athena_test::initGaudi("DataPool_test.txt", pSvcLoc))

Control/AthenaAuditors/CMakeLists.txt

@@ -11,6 +11,8 @@ atlas_depends_on_subdirs(
    PRIVATE
    Control/AthenaBaseComps
    Control/CoWTools
+   Control/StoreGate
+   Event/xAOD/EventInfo
    GaudiKernel )
 
 # External dependencies:
@@ -28,4 +30,4 @@ atlas_add_component( AthenaAuditors
    ${LIBUNWIND_INCLUDE_DIRS} ${GPERFTOOLS_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
    LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${GDB_LIBRARIES}
    ${LIBUNWIND_LIBRARIES} ${ZLIB_LIBRARIES}
-   AthenaBaseComps CoWTools GaudiKernel )
+   AthenaBaseComps CoWTools GaudiKernel xAODEventInfo)