diff --git a/LumiBlock/LumiCalc/LumiCalc/LumiBlockCollectionConverter.h b/LumiBlock/LumiCalc/LumiCalc/LumiBlockCollectionConverter.h
index a4e2c2bc1357a3fac248ae3f40ca0d908aef0c18..7052d7fe84cd6eff3de1b815a8468842d1723952 100644
--- a/LumiBlock/LumiCalc/LumiCalc/LumiBlockCollectionConverter.h
+++ b/LumiBlock/LumiCalc/LumiCalc/LumiBlockCollectionConverter.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -40,26 +40,26 @@ class LumiBlockCollectionConverter {
 
   LumiBlockCollection* GetLumiBlockCollection(const Root::TGoodRunsList& grl, std::map<TString,TString>& metadata, TString& version) ;
   LumiBlockCollection* GetLumiBlockCollection(const Root::TGoodRunsList& grl) const;
-  LumiBlockCollection* GetLumiBlockCollection(const char* xmlfile) const;
-  LumiBlockCollection* GetLumiBlockCollectionFromString( const TString& xmlstring ) const;
+  LumiBlockCollection* GetLumiBlockCollection(const char* xmlfile);
+  LumiBlockCollection* GetLumiBlockCollectionFromString( const TString& xmlstring );
 
-  void CreateXMLFile(const Root::TGoodRunsList& grl, const TString& xmlfilename="", const TString& prefix="" ) const;
-  void CreateXMLFile(const Root::TGRLCollection& grlcollection, const char* xmlfilename) const;
+  void CreateXMLFile(const Root::TGoodRunsList& grl, const TString& xmlfilename="", const TString& prefix="" );
+  void CreateXMLFile(const Root::TGRLCollection& grlcollection, const char* xmlfilename);
   void CreateXMLFile(const LumiBlockCollection& lbc, const grlmetadatamap& metadata = grlmetadatamap(), const char* version="", 
-                     const TString& xmlfilename="", const TString& prefix="" ) const;
-  void CreateXMLFiles(const Root::TGRLCollection& grlcollection, const char* prefix) const;
+                     const TString& xmlfilename="", const TString& prefix="" );
+  void CreateXMLFiles(const Root::TGRLCollection& grlcollection, const char* prefix);
 
-  const TString GetXMLString(const Root::TGoodRunsList& grl) const;
-  const TString GetXMLString(const Root::TGRLCollection& grlcollection) const;
-  const TString GetXMLString(const LumiBlockCollection& lbc, const grlmetadatamap& metadata = grlmetadatamap(), const char* version="" ) const;
-  const std::vector<TString> GetXMLStrings(const Root::TGRLCollection& grlcollection) const;
+  const TString GetXMLString(const Root::TGoodRunsList& grl);
+  const TString GetXMLString(const Root::TGRLCollection& grlcollection);
+  const TString GetXMLString(const LumiBlockCollection& lbc, const grlmetadatamap& metadata = grlmetadatamap(), const char* version="" );
+  const std::vector<TString> GetXMLStrings(const Root::TGRLCollection& grlcollection);
 
   Root::TGoodRunsList* GetGRLObject( const LumiBlockCollection& lbc, const grlmetadatamap& metadata = grlmetadatamap(), const char* version="" ) const;
-  Root::TGoodRunsList* GetGRLObject( const char* xmlfile ) const;
-  Root::TGoodRunsList* GetGRLObjectFromString( const TString& xmlstring ) const;
+  Root::TGoodRunsList* GetGRLObject( const char* xmlfile );
+  Root::TGoodRunsList* GetGRLObjectFromString( const TString& xmlstring );
 
-  Root::TGRLCollection* GetGRLCollection( const char* xmlfile ) const;
-  Root::TGRLCollection* GetGRLCollectionFromString( const TString& xmlstring ) const;
+  Root::TGRLCollection* GetGRLCollection( const char* xmlfile );
+  Root::TGRLCollection* GetGRLCollectionFromString( const TString& xmlstring );
 
   const TString GetSuggestedName( const LumiBlockCollection& lbc ) const ;
 
diff --git a/LumiBlock/LumiCalc/LumiCalc/LumiBlockRangeContainerConverter.h b/LumiBlock/LumiCalc/LumiCalc/LumiBlockRangeContainerConverter.h
index bd5e654f566b1d25e01efff67c47d1abed73a3b5..c95b60bbc581a3e7e4fa886c90cb19c595cb831b 100644
--- a/LumiBlock/LumiCalc/LumiCalc/LumiBlockRangeContainerConverter.h
+++ b/LumiBlock/LumiCalc/LumiCalc/LumiBlockRangeContainerConverter.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -42,26 +42,26 @@ class LumiBlockRangeContainerConverter {
 
   xAOD::LumiBlockRangeContainer* GetLumiBlockRangeContainer(const Root::TGoodRunsList& grl, std::map<TString,TString>& metadata, TString& version) ;
   xAOD::LumiBlockRangeContainer* GetLumiBlockRangeContainer(const Root::TGoodRunsList& grl) const;
-  xAOD::LumiBlockRangeContainer* GetLumiBlockRangeContainer(const char* xmlfile) const;
-  xAOD::LumiBlockRangeContainer* GetLumiBlockRangeContainerFromString( const TString& xmlstring ) const;
+  xAOD::LumiBlockRangeContainer* GetLumiBlockRangeContainer(const char* xmlfile);
+  xAOD::LumiBlockRangeContainer* GetLumiBlockRangeContainerFromString( const TString& xmlstring );
 
-  void CreateXMLFile(const Root::TGoodRunsList& grl, const TString& xmlfilename="", const TString& prefix="" ) const;
-  void CreateXMLFile(const Root::TGRLCollection& grlcollection, const char* xmlfilename) const;
+  void CreateXMLFile(const Root::TGoodRunsList& grl, const TString& xmlfilename="", const TString& prefix="" );
+  void CreateXMLFile(const Root::TGRLCollection& grlcollection, const char* xmlfilename);
   void CreateXMLFile(const xAOD::LumiBlockRangeContainer& lbc, const grlmetadatamap& metadata = grlmetadatamap(), const char* version="", 
-                     const TString& xmlfilename="", const TString& prefix="" ) const;
-  void CreateXMLFiles(const Root::TGRLCollection& grlcollection, const char* prefix) const;
+                     const TString& xmlfilename="", const TString& prefix="" );
+  void CreateXMLFiles(const Root::TGRLCollection& grlcollection, const char* prefix);
 
-  const TString GetXMLString(const Root::TGoodRunsList& grl) const;
-  const TString GetXMLString(const Root::TGRLCollection& grlcollection) const;
-  const TString GetXMLString(const xAOD::LumiBlockRangeContainer& lbc, const grlmetadatamap& metadata = grlmetadatamap(), const char* version="" ) const;
-  const std::vector<TString> GetXMLStrings(const Root::TGRLCollection& grlcollection) const;
+  const TString GetXMLString(const Root::TGoodRunsList& grl);
+  const TString GetXMLString(const Root::TGRLCollection& grlcollection);
+  const TString GetXMLString(const xAOD::LumiBlockRangeContainer& lbc, const grlmetadatamap& metadata = grlmetadatamap(), const char* version="" );
+  const std::vector<TString> GetXMLStrings(const Root::TGRLCollection& grlcollection);
 
   Root::TGoodRunsList* GetGRLObject( const xAOD::LumiBlockRangeContainer& lbc, const grlmetadatamap& metadata = grlmetadatamap(), const char* version="" ) const;
-  Root::TGoodRunsList* GetGRLObject( const char* xmlfile ) const;
-  Root::TGoodRunsList* GetGRLObjectFromString( const TString& xmlstring ) const;
+  Root::TGoodRunsList* GetGRLObject( const char* xmlfile );
+  Root::TGoodRunsList* GetGRLObjectFromString( const TString& xmlstring );
 
-  Root::TGRLCollection* GetGRLCollection( const char* xmlfile ) const;
-  Root::TGRLCollection* GetGRLCollectionFromString( const TString& xmlstring ) const;
+  Root::TGRLCollection* GetGRLCollection( const char* xmlfile );
+  Root::TGRLCollection* GetGRLCollectionFromString( const TString& xmlstring );
 
   const TString GetSuggestedName( const xAOD::LumiBlockRangeContainer& lbc ) const ;
 
diff --git a/LumiBlock/LumiCalc/src/LumiBlockCollectionConverter.cxx b/LumiBlock/LumiCalc/src/LumiBlockCollectionConverter.cxx
index f56fb7594c808979a7164fb9edd1e6f7563b4917..891dd6ffafa746178222e66ec51aa8423cb90475 100644
--- a/LumiBlock/LumiCalc/src/LumiBlockCollectionConverter.cxx
+++ b/LumiBlock/LumiCalc/src/LumiBlockCollectionConverter.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LumiCalc/LumiBlockCollectionConverter.h"
@@ -66,7 +66,7 @@ LumiBlockCollectionConverter::GetLumiBlockCollection(const Root::TGoodRunsList&
 
 
 LumiBlockCollection* 
-LumiBlockCollectionConverter::GetLumiBlockCollection(const char* xmlfile) const
+LumiBlockCollectionConverter::GetLumiBlockCollection(const char* xmlfile)
 {
   Root::TGoodRunsList* pgrl = this->GetGRLObject( xmlfile );
   LumiBlockCollection* iovc = this->GetLumiBlockCollection( *pgrl );
@@ -76,7 +76,7 @@ LumiBlockCollectionConverter::GetLumiBlockCollection(const char* xmlfile) const
 
 
 LumiBlockCollection* 
-LumiBlockCollectionConverter::GetLumiBlockCollectionFromString( const TString& xmlstring ) const
+LumiBlockCollectionConverter::GetLumiBlockCollectionFromString( const TString& xmlstring )
 {
   m_reader->SetXMLString( xmlstring );
   (void) m_reader->Interpret();
@@ -85,7 +85,7 @@ LumiBlockCollectionConverter::GetLumiBlockCollectionFromString( const TString& x
 
 
 void 
-LumiBlockCollectionConverter::CreateXMLFile(const Root::TGRLCollection& grlcollection, const char* xmlfilename) const
+LumiBlockCollectionConverter::CreateXMLFile(const Root::TGRLCollection& grlcollection, const char* xmlfilename)
 {
   m_writer->SetGRLCollection( grlcollection ) ;
   m_writer->SetFilename( xmlfilename ) ;
@@ -94,7 +94,7 @@ LumiBlockCollectionConverter::CreateXMLFile(const Root::TGRLCollection& grlcolle
 
 
 void
-LumiBlockCollectionConverter::CreateXMLFile(const Root::TGoodRunsList& grl, const TString& xmlfilename, const TString& prefix) const
+LumiBlockCollectionConverter::CreateXMLFile(const Root::TGoodRunsList& grl, const TString& xmlfilename, const TString& prefix)
 {
   m_writer->SetGoodRunsList( grl ) ;
   TString xmlfile = ( xmlfilename.IsNull() ? prefix + grl.GetSuggestedName() + ".xml" : xmlfilename );
@@ -105,7 +105,7 @@ LumiBlockCollectionConverter::CreateXMLFile(const Root::TGoodRunsList& grl, cons
 
 void 
 LumiBlockCollectionConverter::CreateXMLFile(const LumiBlockCollection& lbc, const grlmetadatamap& metadata, const char* version, 
-                                            const TString& xmlfilename, const TString& prefix ) const
+                                            const TString& xmlfilename, const TString& prefix )
 {
   Root::TGoodRunsList* pgrl = this->GetGRLObject(lbc,metadata,version);
   m_writer->SetGoodRunsList( *pgrl ) ;
@@ -117,7 +117,7 @@ LumiBlockCollectionConverter::CreateXMLFile(const LumiBlockCollection& lbc, cons
 
 
 void
-LumiBlockCollectionConverter::CreateXMLFiles(const Root::TGRLCollection& grlcollection, const char* prefix) const
+LumiBlockCollectionConverter::CreateXMLFiles(const Root::TGRLCollection& grlcollection, const char* prefix)
 {
   m_writer->SetGRLCollection( grlcollection ) ;
   m_writer->SetPrefix( prefix ) ;
@@ -126,7 +126,7 @@ LumiBlockCollectionConverter::CreateXMLFiles(const Root::TGRLCollection& grlcoll
 
 
 const TString 
-LumiBlockCollectionConverter::GetXMLString(const Root::TGoodRunsList& grl) const
+LumiBlockCollectionConverter::GetXMLString(const Root::TGoodRunsList& grl)
 {
   m_writer->SetGoodRunsList( grl ) ;
   return m_writer->GetXMLString() ;
@@ -134,7 +134,7 @@ LumiBlockCollectionConverter::GetXMLString(const Root::TGoodRunsList& grl) const
 
 
 const TString
-LumiBlockCollectionConverter::GetXMLString(const Root::TGRLCollection& grlcollection) const
+LumiBlockCollectionConverter::GetXMLString(const Root::TGRLCollection& grlcollection)
 {
   m_writer->SetGRLCollection( grlcollection ) ;
   return m_writer->GetXMLString() ;
@@ -142,7 +142,7 @@ LumiBlockCollectionConverter::GetXMLString(const Root::TGRLCollection& grlcollec
 
 
 const std::vector<TString> 
-LumiBlockCollectionConverter::GetXMLStrings(const Root::TGRLCollection& grlcollection) const
+LumiBlockCollectionConverter::GetXMLStrings(const Root::TGRLCollection& grlcollection)
 {
   m_writer->SetGRLCollection( grlcollection ) ;
   return m_writer->GetXMLStrings() ;
@@ -150,7 +150,7 @@ LumiBlockCollectionConverter::GetXMLStrings(const Root::TGRLCollection& grlcolle
 
 
 const TString 
-LumiBlockCollectionConverter::GetXMLString( const LumiBlockCollection& lbc, const std::map<TString,TString>& metadata, const char* version ) const
+LumiBlockCollectionConverter::GetXMLString( const LumiBlockCollection& lbc, const std::map<TString,TString>& metadata, const char* version )
 {
   Root::TGoodRunsList* pgrl = this->GetGRLObject(lbc,metadata,version);
   m_writer->SetGoodRunsList( *pgrl ) ;
@@ -196,7 +196,7 @@ LumiBlockCollectionConverter::GetGRLObject( const LumiBlockCollection& lbc, cons
 
 
 Root::TGoodRunsList* 
-LumiBlockCollectionConverter::GetGRLObject( const char* xmlfile ) const
+LumiBlockCollectionConverter::GetGRLObject( const char* xmlfile )
 {
   m_reader->SetXMLFile( xmlfile );
   (void) m_reader->Interpret();
@@ -205,7 +205,7 @@ LumiBlockCollectionConverter::GetGRLObject( const char* xmlfile ) const
 
 
 Root::TGoodRunsList* 
-LumiBlockCollectionConverter::GetGRLObjectFromString( const TString& xmlstring ) const
+LumiBlockCollectionConverter::GetGRLObjectFromString( const TString& xmlstring )
 {
   m_reader->SetXMLString( xmlstring );
   (void) m_reader->Interpret();
@@ -214,7 +214,7 @@ LumiBlockCollectionConverter::GetGRLObjectFromString( const TString& xmlstring )
 
 
 Root::TGRLCollection*
-LumiBlockCollectionConverter::GetGRLCollection( const char* xmlfile ) const
+LumiBlockCollectionConverter::GetGRLCollection( const char* xmlfile )
 {
   m_reader->SetXMLFile( xmlfile );
   (void) m_reader->Interpret();
@@ -223,7 +223,7 @@ LumiBlockCollectionConverter::GetGRLCollection( const char* xmlfile ) const
 
 
 Root::TGRLCollection*
-LumiBlockCollectionConverter::GetGRLCollectionFromString( const TString& xmlstring ) const
+LumiBlockCollectionConverter::GetGRLCollectionFromString( const TString& xmlstring )
 {
   m_reader->SetXMLString( xmlstring );
   (void) m_reader->Interpret();
diff --git a/LumiBlock/LumiCalc/src/LumiBlockRangeContainerConverter.cxx b/LumiBlock/LumiCalc/src/LumiBlockRangeContainerConverter.cxx
index 12f1e5c95e4487c30959e2c392a426c12ac838bf..3582a80982e6d83759aaa9c458ab27d0591d6533 100644
--- a/LumiBlock/LumiCalc/src/LumiBlockRangeContainerConverter.cxx
+++ b/LumiBlock/LumiCalc/src/LumiBlockRangeContainerConverter.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LumiCalc/LumiBlockRangeContainerConverter.h"
@@ -76,7 +76,7 @@ LumiBlockRangeContainerConverter::GetLumiBlockRangeContainer(const Root::TGoodRu
 
 
 xAOD::LumiBlockRangeContainer* 
-LumiBlockRangeContainerConverter::GetLumiBlockRangeContainer(const char* xmlfile) const
+LumiBlockRangeContainerConverter::GetLumiBlockRangeContainer(const char* xmlfile)
 {
   Root::TGoodRunsList* pgrl = this->GetGRLObject( xmlfile );
   xAOD::LumiBlockRangeContainer* iovc = this->GetLumiBlockRangeContainer( *pgrl );
@@ -86,7 +86,7 @@ LumiBlockRangeContainerConverter::GetLumiBlockRangeContainer(const char* xmlfile
 
 
 xAOD::LumiBlockRangeContainer* 
-LumiBlockRangeContainerConverter::GetLumiBlockRangeContainerFromString( const TString& xmlstring ) const
+LumiBlockRangeContainerConverter::GetLumiBlockRangeContainerFromString( const TString& xmlstring )
 {
   m_reader->SetXMLString( xmlstring );
   (void) m_reader->Interpret();
@@ -95,7 +95,7 @@ LumiBlockRangeContainerConverter::GetLumiBlockRangeContainerFromString( const TS
 
 
 void 
-LumiBlockRangeContainerConverter::CreateXMLFile(const Root::TGRLCollection& grlcollection, const char* xmlfilename) const
+LumiBlockRangeContainerConverter::CreateXMLFile(const Root::TGRLCollection& grlcollection, const char* xmlfilename)
 {
   m_writer->SetGRLCollection( grlcollection ) ;
   m_writer->SetFilename( xmlfilename ) ;
@@ -104,7 +104,7 @@ LumiBlockRangeContainerConverter::CreateXMLFile(const Root::TGRLCollection& grlc
 
 
 void
-LumiBlockRangeContainerConverter::CreateXMLFile(const Root::TGoodRunsList& grl, const TString& xmlfilename, const TString& prefix) const
+LumiBlockRangeContainerConverter::CreateXMLFile(const Root::TGoodRunsList& grl, const TString& xmlfilename, const TString& prefix)
 {
   m_writer->SetGoodRunsList( grl ) ;
   TString xmlfile = ( xmlfilename.IsNull() ? prefix + grl.GetSuggestedName() + ".xml" : xmlfilename );
@@ -115,7 +115,7 @@ LumiBlockRangeContainerConverter::CreateXMLFile(const Root::TGoodRunsList& grl,
 
 void 
 LumiBlockRangeContainerConverter::CreateXMLFile(const xAOD::LumiBlockRangeContainer& lbc, const grlmetadatamap& metadata, const char* version, 
-                                            const TString& xmlfilename, const TString& prefix ) const
+                                            const TString& xmlfilename, const TString& prefix )
 {
   Root::TGoodRunsList* pgrl = this->GetGRLObject(lbc,metadata,version);
   m_writer->SetGoodRunsList( *pgrl ) ;
@@ -127,7 +127,7 @@ LumiBlockRangeContainerConverter::CreateXMLFile(const xAOD::LumiBlockRangeContai
 
 
 void
-LumiBlockRangeContainerConverter::CreateXMLFiles(const Root::TGRLCollection& grlcollection, const char* prefix) const
+LumiBlockRangeContainerConverter::CreateXMLFiles(const Root::TGRLCollection& grlcollection, const char* prefix)
 {
   m_writer->SetGRLCollection( grlcollection ) ;
   m_writer->SetPrefix( prefix ) ;
@@ -136,7 +136,7 @@ LumiBlockRangeContainerConverter::CreateXMLFiles(const Root::TGRLCollection& grl
 
 
 const TString 
-LumiBlockRangeContainerConverter::GetXMLString(const Root::TGoodRunsList& grl) const
+LumiBlockRangeContainerConverter::GetXMLString(const Root::TGoodRunsList& grl)
 {
   m_writer->SetGoodRunsList( grl ) ;
   return m_writer->GetXMLString() ;
@@ -144,7 +144,7 @@ LumiBlockRangeContainerConverter::GetXMLString(const Root::TGoodRunsList& grl) c
 
 
 const TString
-LumiBlockRangeContainerConverter::GetXMLString(const Root::TGRLCollection& grlcollection) const
+LumiBlockRangeContainerConverter::GetXMLString(const Root::TGRLCollection& grlcollection)
 {
   m_writer->SetGRLCollection( grlcollection ) ;
   return m_writer->GetXMLString() ;
@@ -152,7 +152,7 @@ LumiBlockRangeContainerConverter::GetXMLString(const Root::TGRLCollection& grlco
 
 
 const std::vector<TString> 
-LumiBlockRangeContainerConverter::GetXMLStrings(const Root::TGRLCollection& grlcollection) const
+LumiBlockRangeContainerConverter::GetXMLStrings(const Root::TGRLCollection& grlcollection)
 {
   m_writer->SetGRLCollection( grlcollection ) ;
   return m_writer->GetXMLStrings() ;
@@ -160,7 +160,7 @@ LumiBlockRangeContainerConverter::GetXMLStrings(const Root::TGRLCollection& grlc
 
 
 const TString 
-LumiBlockRangeContainerConverter::GetXMLString( const xAOD::LumiBlockRangeContainer& lbc, const std::map<TString,TString>& metadata, const char* version ) const
+LumiBlockRangeContainerConverter::GetXMLString( const xAOD::LumiBlockRangeContainer& lbc, const std::map<TString,TString>& metadata, const char* version )
 {
   Root::TGoodRunsList* pgrl = this->GetGRLObject(lbc,metadata,version);
   m_writer->SetGoodRunsList( *pgrl ) ;
@@ -207,7 +207,7 @@ LumiBlockRangeContainerConverter::GetGRLObject( const xAOD::LumiBlockRangeContai
 
 
 Root::TGoodRunsList* 
-LumiBlockRangeContainerConverter::GetGRLObject( const char* xmlfile ) const
+LumiBlockRangeContainerConverter::GetGRLObject( const char* xmlfile )
 {
   m_reader->SetXMLFile( xmlfile );
   (void) m_reader->Interpret();
@@ -216,7 +216,7 @@ LumiBlockRangeContainerConverter::GetGRLObject( const char* xmlfile ) const
 
 
 Root::TGoodRunsList* 
-LumiBlockRangeContainerConverter::GetGRLObjectFromString( const TString& xmlstring ) const
+LumiBlockRangeContainerConverter::GetGRLObjectFromString( const TString& xmlstring )
 {
   m_reader->SetXMLString( xmlstring );
   (void) m_reader->Interpret();
@@ -225,7 +225,7 @@ LumiBlockRangeContainerConverter::GetGRLObjectFromString( const TString& xmlstri
 
 
 Root::TGRLCollection*
-LumiBlockRangeContainerConverter::GetGRLCollection( const char* xmlfile ) const
+LumiBlockRangeContainerConverter::GetGRLCollection( const char* xmlfile )
 {
   m_reader->SetXMLFile( xmlfile );
   (void) m_reader->Interpret();
@@ -234,7 +234,7 @@ LumiBlockRangeContainerConverter::GetGRLCollection( const char* xmlfile ) const
 
 
 Root::TGRLCollection*
-LumiBlockRangeContainerConverter::GetGRLCollectionFromString( const TString& xmlstring ) const
+LumiBlockRangeContainerConverter::GetGRLCollectionFromString( const TString& xmlstring )
 {
   m_reader->SetXMLString( xmlstring );
   (void) m_reader->Interpret();