AtlasTest/TestTools/test/test_ParallelCallTestExample.cxx

 /*
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 #include <mutex>
 #include <map>
@@ -20,7 +20,8 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
  * @brief Specimen of service caching expensive calculations.
  * It uses internally std::map which is not thread-safely expandable.
  **/
-class ExpensiveCompCacheSvc {
+class IService { };
+class ExpensiveCompCacheSvc : public IService {
 public:
   int compute( int x ) {
     // should the lock be here, or can be later only when we update the map

Control/AthContainers/Root/AuxVectorData.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file AthContainers/src/AuxVectorData.cxx
@@ -515,6 +515,9 @@ void AuxVectorData::Cache::store (SG::auxid_t auxid, void* ptr)
     std::fill (newcache + m_cache_len, newcache + newlen,
                static_cast<void*>(0));
 
+    // The above writes must be visible before we update the cache pointers.
+    AthContainers_detail::fence_seq_cst();
+
     // Store so that other threads can see it.
     // The stores to m_cache must happen before the store to m_cache_len;
     // we use a fence to ensure this.

Control/AthContainers/test/AuxVectorData_test.cxx

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -348,8 +348,8 @@ void ThreadingTest::threadedTest()
   AuxVectorData_test b;
   b.setStore (&m_store);
 
-  int nthread = 10;
-  AthContainers_detail::thread threads[10];
+  constexpr int nthread = 10;
+  AthContainers_detail::thread threads[nthread];
   m_sm.lock();
   for (int i=0; i < nthread; i++)
     threads[i] = AthContainers_detail::thread (testThread (*this, b, i));

Control/AthenaConfiguration/python/AllConfigFlags.py

@@ -43,7 +43,7 @@ def _createCfgFlags():
     acf.addFlag('Input.ProjectName', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("project_name","data17_13TeV") ) # former global.ProjectName
     acf.addFlag('Input.Format', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("file_type","") ) # former global.InputFormat
     acf.addFlag('Input.ProcessingTags', lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("processingTags","") ) # list of names of streams written to this file
-    acf.addFlag('Input.SpecialConfiguration', lambda prevFlags : getSpecialConfigurationMetadata(prevFlags.Input.Files))  # special Configuration options read from input file metadata
+    acf.addFlag('Input.SpecialConfiguration', lambda prevFlags : getSpecialConfigurationMetadata(prevFlags.Input.Files, prevFlags.Input.SecondaryFiles))  # special Configuration options read from input file metadata
 
     def _inputCollections(inputFile):
         if not inputFile:

Control/AthenaConfiguration/python/AutoConfigFlags.py

@@ -159,7 +159,7 @@ def getInitialTimeStampsFromRunNumbers(runNumbers):
     return timeStamps
 
 
-def getSpecialConfigurationMetadata(inputFiles):
+def getSpecialConfigurationMetadata(inputFiles, secondaryInputFiles):
     """Read in special simulation job option fragments based on metadata
     passed by the evgen stage
     """
@@ -180,9 +180,15 @@ def getSpecialConfigurationMetadata(inputFiles):
                                        'SimulationJobOptions/preInclude.Qball.py' : 'Monopole.MonopoleConfigNew.QballPreInclude',
                                        'SimulationJobOptions/preInclude.RHadronsPythia8.py' : None, # FIXME
                                        'SimulationJobOptions/preInclude.fcp.py' : 'Monopole.MonopoleConfigNew.fcpPreInclude' }
+    specialConfigString = ''
+    from AthenaConfiguration.AutoConfigFlags import GetFileMD
     if len(inputFiles)>0:
-        from AthenaConfiguration.AutoConfigFlags import GetFileMD
         specialConfigString = GetFileMD(inputFiles).get('specialConfiguration', '')
+    if (not len(specialConfigString) or specialConfigString == 'NONE') and len(secondaryInputFiles)>0:
+        # If there is no specialConfiguration metadata in the primary
+        # input try the secondary inputs (MC Overlay case)
+        specialConfigString = GetFileMD(secondaryInputFiles).get('specialConfiguration', '')
+    if len(specialConfigString)>0:
         ## Parse the specialConfiguration string
         ## Format is 'key1=value1;key2=value2;...'. or just '
         spcitems = specialConfigString.split(";")

Control/AthenaExamples/AthExHive/src/HiveExSvc.h

@@ -30,7 +30,7 @@ public:
   virtual StatusCode initialize() override;
   virtual StatusCode finalize() override;
   
-  void add(const std::string&, const unsigned int&);
+  virtual void add(const std::string&, const unsigned int&) override;
 
 private:
 

Control/CxxUtils/CxxUtils/SealSharedLib.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -57,7 +57,7 @@ public:
 
     bool		operator== (const Callback1 &x) const;
     /**/		operator bool (void) const;
-    void		operator() (T1) const;
+    void		operator() (T1);
 
 private:
     Callback1Rep<T1>	*m_rep;
@@ -128,7 +128,7 @@ Callback1<T1>::operator bool (void) const
 
 template <class T1>
 inline void
-Callback1<T1>::operator() (T1 a) const
+Callback1<T1>::operator() (T1 a)
 { m_rep->call (a); }
 
 template <class T1, class T2>
@@ -181,7 +181,7 @@ public:
 
     static SharedLibrary *	self (void);
     static SharedLibrary *	load (const std::string &name);
-    static void			loaded (const InfoHandler &handler);
+    static void			loaded (InfoHandler &handler);
 
     void			release (void);
     void			abandon (void);

Control/CxxUtils/Root/SealSharedLib.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -287,7 +287,7 @@ SharedLibrary::load (const std::string &name)
 /** Iterate and provide information about all currently loaded
     shared libraries.  */
 void
-SharedLibrary::loaded (const InfoHandler &handler)
+SharedLibrary::loaded (InfoHandler &handler)
 {
     // Dynamic linker characteristics:
     //   AIX, Windows, SVR4 (DG/UX, DRS/NX, DYNIX/ptx, Linux, SINIX,

Database/AthenaPOOL/RootConversions/src/TConvertingBranchElement.cxx

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -938,7 +938,17 @@ Int_t TConvertingBranchElement::GetEntry(Long64_t entry, Int_t getall)
       TBasket* basket = (TBasket*)GetBasket(GetReadBasket());
       TBuffer* buffer = basket->GetBufferRef();
       Int_t bufbegin = buffer->Length();
+
+      // Suppress false positive seen wth gcc11.
+#if __GNUC__ == 11
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
       (this->*fReadLeaves) (*buffer);
+#if __GNUC__ == 11
+# pragma GCC diagnostic pop
+#endif
+
       nb = buffer->Length() - bufbegin;
     }
     else

DetectorDescription/ReadoutGeometryBase/ReadoutGeometryBase/DetectorDesign.h

@@ -39,7 +39,7 @@ class SiLocalPosition;
 class SiIntersect;
 
 enum DetectorShape {
-  Box=0, Trapezoid, Annulus,Other
+  Box=0, Trapezoid, Annulus,Other,PolarAnnulus
 };
 
 enum DetectorType {

DetectorDescription/ReadoutGeometryBase/src/SolidStateDetectorElementBase.cxx

@@ -143,7 +143,18 @@ using Trk::distDepth;
 
     if (!dir.m_etaDirection) xEta = -xEta;
     if (!dir.m_phiDirection) xPhi = -xPhi;
-    return Amg::Vector2D(xPhi, xEta);
+    auto result = Amg::Vector2D(xPhi, xEta);
+
+    if (m_design->shape() == InDetDD::PolarAnnulus) { // Do conversion to polar co-ords as well
+      double x = result.x();
+      double y = result.y();
+
+      double r = std::hypot(x,y);
+      double phi = std::atan2(y,x);
+      result = Amg::Vector2D(phi,r);
+    }
+
+    return result;
   }
 
   HepGeom::Point3D<double>

DetectorDescription/RegionSelector/python/RegSelToolConfig.py

@@ -239,7 +239,8 @@ def regSelTool_TRT_Cfg(flags):
     # temporary
     from PixelConditionsAlgorithms.PixelConditionsConfig import PixelCablingCondAlgCfg
     return regSelToolCfg(flags, "TRT", CompFactory.TRT_RegSelCondAlg,
-                         readout_geometry=TRT_ReadoutGeometryCfg(flags), conditions=PixelCablingCondAlgCfg(flags))
+                         readout_geometry=TRT_ReadoutGeometryCfg(flags),
+                         conditions=PixelCablingCondAlgCfg(flags))  # FIXME: TRT should not depend on Pixel
 
 # ITk
 def regSelTool_ITkPixel_Cfg(flags):
@@ -272,18 +273,28 @@ def regSelTool_RPC_Cfg(flags):
                          conditions=RPCCablingConfigCfg(flags))
 
 def regSelTool_TGC_Cfg(flags):
-    from MuonConfig.MuonCablingConfig import TGCCablingConfigCfg
+    from MuonConfig.MuonCablingConfig import MDTCablingConfigCfg, TGCCablingConfigCfg
+
+    conditions = ComponentAccumulator()
+    conditions.merge(MDTCablingConfigCfg(flags))  # FIXME: should not depend on MDT
+    conditions.merge(TGCCablingConfigCfg(flags))
     return regSelToolCfg(flags, "TGC", CompFactory.TGC_RegSelCondAlg,
-                         conditions=TGCCablingConfigCfg(flags))
+                         conditions=conditions)
 
 def regSelTool_CSC_Cfg(flags):
-    return regSelToolCfg(flags, "CSC", CompFactory.CSC_RegSelCondAlg)
+    from MuonConfig.MuonCablingConfig import MDTCablingConfigCfg
+    return regSelToolCfg(flags, "CSC", CompFactory.CSC_RegSelCondAlg,
+                         conditions=MDTCablingConfigCfg(flags))  # FIXME: CSC should not depend on MDT
 
 def regSelTool_STGC_Cfg(flags):
-    return regSelToolCfg(flags, "STGC", CompFactory.sTGC_RegSelCondAlg)
+    from MuonConfig.MuonCablingConfig import MDTCablingConfigCfg
+    return regSelToolCfg(flags, "STGC", CompFactory.sTGC_RegSelCondAlg,
+                         conditions=MDTCablingConfigCfg(flags))  # FIXME: sTGC should not depend on MDT
 
 def regSelTool_MM_Cfg(flags):
-    return regSelToolCfg(flags, "MM", CompFactory.MM_RegSelCondAlg)
+    from MuonConfig.MuonCablingConfig import MDTCablingConfigCfg
+    return regSelToolCfg(flags, "MM", CompFactory.MM_RegSelCondAlg,
+                         conditions=MDTCablingConfigCfg(flags))  # FIXME: MM should not depend on MDT
 
 
 # calo 

Event/xAOD/xAODTrigger/Root/jFexLRJetRoI_v1.cxx

@@ -40,7 +40,7 @@ namespace xAOD {
    jFexLRJetRoI_v1::jFexLRJetRoI_v1()
      : SG::AuxElement() {
    }
-   void jFexLRJetRoI_v1::initialize( uint8_t jFexNumber, uint8_t fpgaNumber, uint32_t tobWord) {
+   void jFexLRJetRoI_v1::initialize( uint8_t jFexNumber, uint8_t fpgaNumber, uint32_t tobWord, float_t eta, float_t phi) {
  
      setTobWord( tobWord );
      setjFexNumber( jFexNumber );
@@ -51,8 +51,8 @@ namespace xAOD {
      setTobSat(unpackSaturationIndex());
      setGlobalEta(unpackGlobalEta());
      setGlobalPhi(unpackGlobalPhi());
-     setEta( (unpackGlobalEta()+unpackTTweightEta())/10 );
-     setPhi( (unpackGlobalPhi()+unpackTTweightPhi())/10 );
+     setEta( eta );
+     setPhi( phi );
 
    //include in future when xTOB in jFEX has been implemented.
 
@@ -191,60 +191,11 @@ namespace xAOD {
             globalPhi = tobLocalPhi() + (fpgaNumber() * 16);
         }
 
-
         return globalPhi;
 
     }
 
 
-    float jFexLRJetRoI_v1::unpackTTweightEta() const{
-        float weight = 0.0;
-        if(jFexNumber() == 0 || jFexNumber() == 5) {
-
-            if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
-                weight = 0.5;
-            }
-            else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
-                weight = 1.0;
-            }
-            else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
-                weight = 0.5;
-            }
-            else if(tobLocalEta() <=s_FWD_EtaPosition[6]) {//Region 4
-                weight = 0.5;
-            }
-        }
-        else{ //Modules 1-4
-            weight = 0.5;
-        }
-
-        return   weight;
-    }
-    float jFexLRJetRoI_v1::unpackTTweightPhi() const{
-        float weight = 0.0;
-        if(jFexNumber() == 0 || jFexNumber() == 5) {
-
-            if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
-                weight = 0.5;
-            }
-            else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
-                weight = 1.0;
-            }
-            else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
-                weight = 1.0;
-            }
-            else if(tobLocalEta() <=s_FWD_EtaPosition[6]) {//Region 4
-                weight = 2;
-            }
-        }
-        else { //Modules 1-4
-            weight = 0.5;
-        }
-
-        return   weight;
-    }
-
-
 } // namespace xAOD
 
 

Event/xAOD/xAODTrigger/Root/jFexSRJetRoI_v1.cxx

@@ -39,7 +39,7 @@ namespace xAOD {
       : SG::AuxElement() {
    }
 
-   void jFexSRJetRoI_v1::initialize( uint8_t jFexNumber, uint8_t fpgaNumber, uint32_t tobWord) {
+   void jFexSRJetRoI_v1::initialize( uint8_t jFexNumber, uint8_t fpgaNumber, uint32_t tobWord, float_t eta, float_t phi) {
     
     
      setTobWord( tobWord );
@@ -51,8 +51,8 @@ namespace xAOD {
      setTobSat(unpackSaturationIndex());
      setGlobalEta(unpackGlobalEta());
      setGlobalPhi(unpackGlobalPhi()); 
-     setEta( (unpackGlobalEta()+unpackTTweightEta())/10 ); 
-     setPhi( (unpackGlobalPhi()+unpackTTweightPhi())/10 ); 
+     setEta( eta ); 
+     setPhi( phi ); 
           
    //include in future when xTOB in jFEX has been implemented.
 
@@ -197,55 +197,6 @@ namespace xAOD {
         return globalPhi;
 
     }
-    
-    
-    float jFexSRJetRoI_v1::unpackTTweightEta() const{
-        float weight = 0.0;
-        if(jFexNumber() == 0 || jFexNumber() == 5) {
-            
-            if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
-                weight = 0.5;
-            }
-            else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
-                weight = 1.0;
-            }
-            else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
-                weight = 0.5;
-            }
-            else if(tobLocalEta() <=s_FWD_EtaPosition[6]) {//Region 4
-                weight = 0.5;
-            }
-        }
-        else { //Modules 1-4
-            weight = 0.5;
-        }
-        
-        return  weight;     
-    }
-    
-    float jFexSRJetRoI_v1::unpackTTweightPhi() const{
-        float weight = 0.0;
-        if(jFexNumber() == 0 || jFexNumber() == 5) {
-            
-            if(tobLocalEta() <=s_FWD_EtaPosition[1]) { //Region 1
-                weight = 0.5;
-            }
-            else if(tobLocalEta() <=s_FWD_EtaPosition[3]) { //Region 2
-                weight = 1.0;
-            }
-            else if(tobLocalEta() == s_FWD_EtaPosition[4] ) { //Region 3
-                weight = 1.0;
-            }
-            else if(tobLocalEta() <=s_FWD_EtaPosition[6]) {//Region 4
-                weight = 2;
-            }
-        }
-        else { //Modules 1-4
-            weight = 0.5;
-        }
-        
-        return   weight;         
-    }
 
 } // namespace xAOD
 

Event/xAOD/xAODTrigger/Root/jFexTauRoI_v1.cxx

@@ -23,7 +23,7 @@ namespace xAOD {
    jFexTauRoI_v1::jFexTauRoI_v1()
      : SG::AuxElement() {
    }
-   void jFexTauRoI_v1::initialize( uint8_t jFexNumber,uint8_t fpgaNumber, uint32_t tobWord) {
+   void jFexTauRoI_v1::initialize( uint8_t jFexNumber,uint8_t fpgaNumber, uint32_t tobWord, float_t eta, float_t phi) {
  
      setTobWord( tobWord );
      setjFexNumber( jFexNumber );
@@ -35,8 +35,8 @@ namespace xAOD {
      setTobSat(unpackSaturationIndex());
      setGlobalEta(unpackGlobalEta());
      setGlobalPhi(unpackGlobalPhi());
-     setEta( (unpackGlobalEta()+0.5)/10 );
-     setPhi( (unpackGlobalPhi()+0.5)/10 ); 
+     setEta( eta );
+     setPhi( phi ); 
    //include in future when xTOB in jFEX has been implemented.
 
    // If the object is a TOB then the isTOB should be true.

Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexLRJetRoI_v1.h

@@ -26,7 +26,7 @@ namespace xAOD {
       jFexLRJetRoI_v1();
 
       /// In future initialze the xTOB as well, word1
-      void initialize(uint8_t jFexNumber,uint8_t fpgaNumber, uint32_t tobWord );
+      void initialize(uint8_t jFexNumber, uint8_t fpgaNumber, uint32_t tobWord, float_t eta, float_t phi);
 
       /// The "raw" 32-bit word describing the object candidate
       uint32_t  tobWord()       const;
@@ -95,9 +95,6 @@ namespace xAOD {
       //static const int s_resMask  = 0x7ff; 
       static const int s_satMask  = 0x1; 
 
-      float unpackTTweightEta() const; 
-      float unpackTTweightPhi() const; 
-
    }; // class jFexLRJetRoI_v1
 
 } // namespace xAOD

Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexSRJetRoI_v1.h

@@ -26,7 +26,7 @@ namespace xAOD {
       jFexSRJetRoI_v1();
 
       /// In future initialze the xTOB as well, word1
-      void initialize(uint8_t jFexNumber,uint8_t fpgaNumber, uint32_t tobWord );
+      void initialize(uint8_t jFexNumber,uint8_t fpgaNumber, uint32_t tobWord, float_t eta, float_t phi );
 
       /// The "raw" 32-bit word describing the object candidate
       uint32_t  tobWord()       const;
@@ -94,9 +94,6 @@ namespace xAOD {
       //static const int s_resMask  = 0x7ff; 
       static const int s_satMask = 0x1; 
       
-      float unpackTTweightEta() const;
-      float unpackTTweightPhi() const;
-
    }; // class jFexSRJetRoI_v1
 
 } // namespace xAOD

Event/xAOD/xAODTrigger/xAODTrigger/versions/jFexTauRoI_v1.h

@@ -26,7 +26,7 @@ namespace xAOD {
       jFexTauRoI_v1();
 
       /// In future initialze the xTOB as well, word1
-      void initialize(uint8_t jFexNumber,uint8_t fpgaNumber, uint32_t tobWord );
+      void initialize(uint8_t jFexNumber,uint8_t fpgaNumber, uint32_t tobWord, float_t eta, float_t phi );
 
       /// The "raw" 32-bit word describing the object candidate
       uint32_t  tobWord()       const;

Generators/EvgenProdTools/src/FixHepMC.cxx

@@ -46,6 +46,7 @@ StatusCode FixHepMC::execute() {
 
     // Some heuristics
     std::vector<HepMC::GenParticlePtr> tofix;
+    // Herwig7+EvtGen has problems with bad pdg id. 16.11.2021
     std::vector<HepMC::GenParticlePtr> bad_pdg_id_particles;
     for (auto ip: evt->particles()) {
       // Skip this particle if (somehow) its pointer is null
@@ -60,6 +61,15 @@ StatusCode FixHepMC::execute() {
       if (pdg_id == 43 || pdg_id == 44 || pdg_id == -43 || pdg_id == -44 || pdg_id == 30353 || pdg_id == -30353 || pdg_id == 30343 || pdg_id == -30343) bad_pdg_id_particles.push_back(ip);
     }
 
+    // SHERPA has problems with bad beam particles. 16.11.2021
+    auto beams_t = evt->beams();
+    if (beams_t.size() != 2) {
+      ATH_MSG_INFO("Invalid number of beam particles " <<  beams_t.size() << ". Will try to fix.");
+      std::vector<HepMC::GenParticlePtr> bparttoremove;
+      for (auto bpart: beams_t) if (bpart->id() == 0 && bpart->production_vertex()) bparttoremove.push_back(bpart); 
+      for (auto bpart: bparttoremove) bpart->production_vertex()->remove_particle_out(bpart); 
+    }
+
     /// AV: In case we have 3 particles, we try to add a vertex that correspond to 1->2 and 1->1 splitting.
     if (tofix.size() == 3 || tofix.size() == 2) {
       size_t no_endv = 0;

Generators/Sherpa_i/src/Sherpa_i.cxx

@@ -237,7 +237,8 @@ StatusCode Sherpa_i::fillEvt(HepMC::GenEvent* event) {
 
 #ifdef HEPMC3
 // units correction
-      event->set_units(HepMC3::Units::MEV, HepMC3::Units::MM);
+      event->set_units(HepMC3::Units::GEV, HepMC3::Units::MM);
+  GeVToMeV(event);
 //uncomment to list HepMC3 events
 //    std::cout << " print::listing Sherpa " << std::endl;
 //    HepMC3::Print::listing(std::cout, *event);