Merge branch 'cherry-pick-cc2a3b26 [formerly ed62cee5fc]-master' into 'master'

Sweeping !16432 from 21.0 to master.
Fixing warning during dictionary generation (ATLASSIM-3835)

See merge request atlas/athena!16543

Former-commit-id: f9965862

Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/CMakeLists.txt

@@ -60,6 +60,8 @@ atlas_add_root_dictionary( ISF_FastCaloSimParametrizationLib
                            ISF_FastCaloSimParametrization/TFCSSimpleLateralShapeParametrization.h
                            ISF_FastCaloSimParametrization/TreeReader.h
                            ISF_FastCaloSimParametrization/FCS_Cell.h
+                           ISF_FastCaloSimParametrization/CaloGeometry.h
+                           ISF_FastCaloSimParametrization/CaloGeometryLookup.h 
                            Root/LinkDef.h
                            EXTERNAL_PACKAGES  ROOT HepPDT XercesC CLHEP HepMC Geant4 )
 

Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimParametrization/Root/LinkDef.h

@@ -17,8 +17,6 @@
 #pragma link C++ struct std::vector<FCS_matchedcell>+;
 #pragma link C++ struct FCS_matchedcellvector+;
 #pragma link C++ class std::vector<Float_t>+;
-#pragma link C++ struct FCS_truth+;
-#pragma link C++ struct std::vector<FCS_truth>+;
 #pragma link C++ class std::vector<std::vector<float> >+;
 #ifndef CaloGeometryFromFile_h
 #pragma link C++ class CaloGeometryLookup;