From 70c0b1affbb27c93709634b3626d7280f14df8ca Mon Sep 17 00:00:00 2001
From: Ivan Razumov <iarspider@gmail.com>
Date: Tue, 12 Sep 2023 10:06:20 +0200
Subject: [PATCH 1/5] Apply suggested fix for #42624

---
 DataFormats/Common/interface/SortedCollection.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/DataFormats/Common/interface/SortedCollection.h b/DataFormats/Common/interface/SortedCollection.h
index 523109ec78500..227474f210054 100644
--- a/DataFormats/Common/interface/SortedCollection.h
+++ b/DataFormats/Common/interface/SortedCollection.h
@@ -28,7 +28,8 @@ unreliable if such duplicate entries are made.
 #include "DataFormats/Common/interface/CMS_CLASS_VERSION.h"
 #include "DataFormats/Common/interface/fillPtrVector.h"
 #include "DataFormats/Common/interface/FillView.h"
-#include "DataFormats/Common/interface/Ref.h"
+// #include "DataFormats/Common/interface/Ref.h"
+#include "DataFormats/Common/interface/setPtr.h"
 #include "DataFormats/Common/interface/traits.h"
 #include "DataFormats/Provenance/interface/ProductID.h"
 #include "FWCore/Utilities/interface/EDMException.h"

From e830625e6f8f631d6343119a8a750bcabe7236c4 Mon Sep 17 00:00:00 2001
From: Ivan Razumov <ivan.razumov@cern.ch>
Date: Tue, 12 Sep 2023 11:46:13 +0200
Subject: [PATCH 2/5] Add missing includes

---
 EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc           | 1 +
 .../HcalRecProducers/bin/makeHcalRecHitGpuValidationPlots.cpp    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc b/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc
index 48f6dc47baba2..70f247497a338 100644
--- a/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc
+++ b/EventFilter/EcalRawToDigi/src/EcalElectronicsMapper.cc
@@ -1,3 +1,4 @@
+#include <cassert>
 #include <FWCore/MessageLogger/interface/MessageLogger.h>
 #include <EventFilter/EcalRawToDigi/interface/EcalElectronicsMapper.h>
 #include <Geometry/EcalMapping/interface/EcalElectronicsMapping.h>
diff --git a/RecoLocalCalo/HcalRecProducers/bin/makeHcalRecHitGpuValidationPlots.cpp b/RecoLocalCalo/HcalRecProducers/bin/makeHcalRecHitGpuValidationPlots.cpp
index fe6aabf928aca..866ebbb304cd3 100644
--- a/RecoLocalCalo/HcalRecProducers/bin/makeHcalRecHitGpuValidationPlots.cpp
+++ b/RecoLocalCalo/HcalRecProducers/bin/makeHcalRecHitGpuValidationPlots.cpp
@@ -11,6 +11,7 @@
 #include <TPaveStats.h>
 
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
+#include "DataFormats/Common/interface/Wrapper.h"
 //#include "CUDADataFormats/HcalRecHitSoA/interface/RecHitCollection.h"
 
 #define CREATE_HIST_1D(varname, nbins, first, last) auto varname = new TH1D(#varname, #varname, nbins, first, last)

From 32dd1e82844d5218722bb8e99538e724f18d56cb Mon Sep 17 00:00:00 2001
From: Ivan Razumov <iarspider@gmail.com>
Date: Tue, 12 Sep 2023 13:59:27 +0200
Subject: [PATCH 3/5] Remove unused dicts and add missing includes

---
 DataFormats/FTLDigi/src/classes_def.xml                  | 4 ----
 DataFormats/HGCDigi/src/classes_def.xml                  | 1 -
 RecoCaloTools/Selectors/interface/CaloConeSelector.h     | 1 +
 RecoCaloTools/Selectors/interface/CaloDualConeSelector.h | 1 +
 RecoCaloTools/Selectors/test/TestCaloSelectors.cc        | 1 +
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/DataFormats/FTLDigi/src/classes_def.xml b/DataFormats/FTLDigi/src/classes_def.xml
index ba4aaecac7843..680d0a1bda2a4 100644
--- a/DataFormats/FTLDigi/src/classes_def.xml
+++ b/DataFormats/FTLDigi/src/classes_def.xml
@@ -4,7 +4,6 @@
    <class name="FTLDataFrame"/>
    <class name="std::vector<FTLDataFrame>"/>
    <class name="FTLDigiCollection"/>
-   <class name="edm::Wrapper<FTLDigiCollection>" />
    <class name="BTLSample"/>
    <class name="std::vector<BTLSample>"/>
    <class name="ETLSample"/>
@@ -12,16 +11,13 @@
    <class name="BTLDataFrame"/>
    <class name="std::vector<BTLDataFrame>"/>
    <class name="BTLDigiCollection"/>
-   <class name="edm::Wrapper<BTLDigiCollection>"/>
    <class name="ETLDataFrame"/>
    <class name="std::vector<ETLDataFrame>"/>
    <class name="ETLDigiCollection"/>
-   <class name="edm::Wrapper<ETLDigiCollection>"/>   
 
    <class name="PMTDSimAccumulator"/>
    <class name="PMTDSimAccumulator::Data"/>
    <class name="PMTDSimAccumulator::DetIdSize"/>
    <class name="std::vector<PMTDSimAccumulator::Data>"/>
    <class name="std::vector<PMTDSimAccumulator::DetIdSize>"/>
-   <class name="edm::Wrapper<PMTDSimAccumulator>"/>
 </lcgdict>
diff --git a/DataFormats/HGCDigi/src/classes_def.xml b/DataFormats/HGCDigi/src/classes_def.xml
index cd2cf75d348f2..8667e75f11421 100644
--- a/DataFormats/HGCDigi/src/classes_def.xml
+++ b/DataFormats/HGCDigi/src/classes_def.xml
@@ -15,6 +15,5 @@
    <class name="HGCDataFrame<DetId,HGCSample>"/>
    <class name="std::vector<HGCDataFrame<DetId,HGCSample> >"/>
    <class name="edm::SortedCollection<HGCDataFrame<DetId,HGCSample>, edm::StrictWeakOrdering<HGCDataFrame<DetId,HGCSample> > >"/>
-   <class name="edm::Wrapper<edm::SortedCollection<HGCDataFrame<DetId,HGCSample>,edm::StrictWeakOrdering<HGCDataFrame<DetId,HGCSample> > > >" />
 
 </lcgdict>
diff --git a/RecoCaloTools/Selectors/interface/CaloConeSelector.h b/RecoCaloTools/Selectors/interface/CaloConeSelector.h
index ff51fb85dadef..969f79193d7b3 100644
--- a/RecoCaloTools/Selectors/interface/CaloConeSelector.h
+++ b/RecoCaloTools/Selectors/interface/CaloConeSelector.h
@@ -5,6 +5,7 @@
 #include "DataFormats/Common/interface/SortedCollection.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include <memory>
+#include <functional>
 
 /** \class CaloConeSelector
   *  
diff --git a/RecoCaloTools/Selectors/interface/CaloDualConeSelector.h b/RecoCaloTools/Selectors/interface/CaloDualConeSelector.h
index 983ed7666a7dd..263669c83e699 100644
--- a/RecoCaloTools/Selectors/interface/CaloDualConeSelector.h
+++ b/RecoCaloTools/Selectors/interface/CaloDualConeSelector.h
@@ -5,6 +5,7 @@
 #include "DataFormats/Common/interface/SortedCollection.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include <memory>
+#include <functional>
 
 /** \class CaloDualConeSelector
   *  
diff --git a/RecoCaloTools/Selectors/test/TestCaloSelectors.cc b/RecoCaloTools/Selectors/test/TestCaloSelectors.cc
index f03d0ba3a7c06..7debfca154df2 100644
--- a/RecoCaloTools/Selectors/test/TestCaloSelectors.cc
+++ b/RecoCaloTools/Selectors/test/TestCaloSelectors.cc
@@ -11,6 +11,7 @@
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include <iostream>
+#include <functional>
 
 class TestCaloSelectors : public edm::one::EDAnalyzer<> {
 public:

From 292f33144d1ea83883d0a2ed7f32667b4670c27c Mon Sep 17 00:00:00 2001
From: Ivan Razumov <iarspider@gmail.com>
Date: Tue, 12 Sep 2023 16:12:09 +0200
Subject: [PATCH 4/5] Revert changes to classes_def.xml

---
 DataFormats/FTLDigi/src/classes.h       | 1 +
 DataFormats/FTLDigi/src/classes_def.xml | 4 ++++
 DataFormats/HGCDigi/src/classes.h       | 1 +
 DataFormats/HGCDigi/src/classes_def.xml | 1 +
 4 files changed, 7 insertions(+)

diff --git a/DataFormats/FTLDigi/src/classes.h b/DataFormats/FTLDigi/src/classes.h
index 1015fcb0ef9c7..f02505a83dcfc 100644
--- a/DataFormats/FTLDigi/src/classes.h
+++ b/DataFormats/FTLDigi/src/classes.h
@@ -1,3 +1,4 @@
 #include <vector>
 #include "DataFormats/FTLDigi/interface/FTLDigiCollections.h"
 #include "DataFormats/FTLDigi/interface/PMTDSimAccumulator.h"
+#include "DataFormats/Common/interface/Ref.h"
diff --git a/DataFormats/FTLDigi/src/classes_def.xml b/DataFormats/FTLDigi/src/classes_def.xml
index 680d0a1bda2a4..ba4aaecac7843 100644
--- a/DataFormats/FTLDigi/src/classes_def.xml
+++ b/DataFormats/FTLDigi/src/classes_def.xml
@@ -4,6 +4,7 @@
    <class name="FTLDataFrame"/>
    <class name="std::vector<FTLDataFrame>"/>
    <class name="FTLDigiCollection"/>
+   <class name="edm::Wrapper<FTLDigiCollection>" />
    <class name="BTLSample"/>
    <class name="std::vector<BTLSample>"/>
    <class name="ETLSample"/>
@@ -11,13 +12,16 @@
    <class name="BTLDataFrame"/>
    <class name="std::vector<BTLDataFrame>"/>
    <class name="BTLDigiCollection"/>
+   <class name="edm::Wrapper<BTLDigiCollection>"/>
    <class name="ETLDataFrame"/>
    <class name="std::vector<ETLDataFrame>"/>
    <class name="ETLDigiCollection"/>
+   <class name="edm::Wrapper<ETLDigiCollection>"/>   
 
    <class name="PMTDSimAccumulator"/>
    <class name="PMTDSimAccumulator::Data"/>
    <class name="PMTDSimAccumulator::DetIdSize"/>
    <class name="std::vector<PMTDSimAccumulator::Data>"/>
    <class name="std::vector<PMTDSimAccumulator::DetIdSize>"/>
+   <class name="edm::Wrapper<PMTDSimAccumulator>"/>
 </lcgdict>
diff --git a/DataFormats/HGCDigi/src/classes.h b/DataFormats/HGCDigi/src/classes.h
index c52ba2ba0c008..bd98c396de743 100644
--- a/DataFormats/HGCDigi/src/classes.h
+++ b/DataFormats/HGCDigi/src/classes.h
@@ -1,2 +1,3 @@
 #include <vector>
 #include "DataFormats/HGCDigi/interface/HGCDigiCollections.h"
+#include "DataFormats/Common/interface/Ref.h"
diff --git a/DataFormats/HGCDigi/src/classes_def.xml b/DataFormats/HGCDigi/src/classes_def.xml
index 8667e75f11421..cd2cf75d348f2 100644
--- a/DataFormats/HGCDigi/src/classes_def.xml
+++ b/DataFormats/HGCDigi/src/classes_def.xml
@@ -15,5 +15,6 @@
    <class name="HGCDataFrame<DetId,HGCSample>"/>
    <class name="std::vector<HGCDataFrame<DetId,HGCSample> >"/>
    <class name="edm::SortedCollection<HGCDataFrame<DetId,HGCSample>, edm::StrictWeakOrdering<HGCDataFrame<DetId,HGCSample> > >"/>
+   <class name="edm::Wrapper<edm::SortedCollection<HGCDataFrame<DetId,HGCSample>,edm::StrictWeakOrdering<HGCDataFrame<DetId,HGCSample> > > >" />
 
 </lcgdict>

From fdf574d674bda6a1cf4a9b2f208c2d635cbfdbec Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Tue, 12 Sep 2023 16:25:16 +0200
Subject: [PATCH 5/5] Update DataFormats/Common/interface/SortedCollection.h

Co-authored-by: Matti Kortelainen <matti.kortelainen@cern.ch>
---
 DataFormats/Common/interface/SortedCollection.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/DataFormats/Common/interface/SortedCollection.h b/DataFormats/Common/interface/SortedCollection.h
index 227474f210054..8bca0f397d15f 100644
--- a/DataFormats/Common/interface/SortedCollection.h
+++ b/DataFormats/Common/interface/SortedCollection.h
@@ -28,7 +28,6 @@ unreliable if such duplicate entries are made.
 #include "DataFormats/Common/interface/CMS_CLASS_VERSION.h"
 #include "DataFormats/Common/interface/fillPtrVector.h"
 #include "DataFormats/Common/interface/FillView.h"
-// #include "DataFormats/Common/interface/Ref.h"
 #include "DataFormats/Common/interface/setPtr.h"
 #include "DataFormats/Common/interface/traits.h"
 #include "DataFormats/Provenance/interface/ProductID.h"