Projects/AnalysisBase/version.txt

-25.2.11
+25.2.12

Projects/AthAnalysis/version.txt

-25.2.11
+25.2.12

Simulation/Barcode/BarcodeInterfaces/BarcodeInterfaces/IBarcodeSvc.h

@@ -45,12 +45,6 @@ namespace Barcode {
     /** Generate a new unique vertex barcode below the simulation offset */
     virtual int newGeneratedVertex() = 0;
 
-    /** Generate a common barcode which will be shared by all children
-        of the given parent barcode (used for child particles which are
-        not stored in the mc truth event) */
-    virtual int sharedChildBarcode( int parentBC,
-                                                int process=0 ) = 0;
-
     /** Inform the BarcodeSvc about the largest particle and vertex Barcodes
         in the event input */
     virtual void registerLargestGeneratedParticleBC( int bc) = 0;

Simulation/Barcode/BarcodeServices/BarcodeServices/LegacyBarcodeSvc.h

@@ -59,12 +59,6 @@ namespace Barcode {
     /** Generate a new unique vertex barcode below the simulation offset */
     virtual int newGeneratedVertex() override;
 
-    /** Generate a common barcode which will be shared by all children
-        of the given parent barcode (used for child particles which are
-        not stored in the mc truth event) */
-    virtual int sharedChildBarcode( int parentBC,
-                                                int process=0 ) override;
-
     /** Inform the BarcodeSvc about the largest particle and vertex Barcodes
         in the event input */
     virtual void registerLargestGeneratedParticleBC( int bc) override;

Simulation/Barcode/BarcodeServices/BarcodeServices/ValidationBarcodeSvc.h

@@ -59,12 +59,6 @@ namespace Barcode {
     /** Generate a new unique vertex barcode below the simulation offset */
     virtual int newGeneratedVertex() override;
 
-    /** Generate a common barcode which will be shared by all children
-        of the given parent barcode (used for child particles which are
-        not stored in the mc truth event) */
-    virtual int sharedChildBarcode( int parentBC,
-                                    int process=0 ) override;
-
     /** Return the secondary particle and vertex offsets */
     virtual int secondaryParticleBcOffset() const override;
     virtual int secondaryVertexBcOffset() const override;

Simulation/Barcode/BarcodeServices/src/LegacyBarcodeSvc.cxx

@@ -172,17 +172,6 @@ int Barcode::LegacyBarcodeSvc::newGeneratedParticle(int)
 }
 
 
-/** Generate a common barcode which will be shared by all children
-    of the given parent barcode (used for child particles which are
-    not stored in the mc truth event) */
-int Barcode::LegacyBarcodeSvc::sharedChildBarcode( int /* parentBC */,
-                                                                        int /* process */)
-{
-  // concept of shared barcodes not present in MC12 yet
-  return HepMC::UNDEFINED_ID;
-}
-
-
 void Barcode::LegacyBarcodeSvc::registerLargestGeneratedParticleBC( int bc ) {
     ATH_MSG_DEBUG( "registering largest generated particle barcode" );
     BarcodeInfo& barcodeInfo = getBarcodeInfo();

Simulation/Barcode/BarcodeServices/src/ValidationBarcodeSvc.cxx

@@ -118,16 +118,6 @@ int Barcode::ValidationBarcodeSvc::newGeneratedVertex()
 }
 
 
-/** Generate a common barcode which will be shared by all children
-    of the given parent barcode (used for child particles which are
-    not stored in the mc truth event) */
-int Barcode::ValidationBarcodeSvc::sharedChildBarcode( int parentBC,
-                                                                            int /* process */)
-{
-  return parentBC+m_barcodeGenerationOffset;
-}
-
-
 /** Return the secondary particle offset */
 int Barcode::ValidationBarcodeSvc::secondaryParticleBcOffset() const
 {

Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticle.h

@@ -157,8 +157,6 @@ namespace ISF {
     int barcode() const; // FIXME barcode-based
     /** set a new barcode */
     void setBarcode(int bc); // FIXME barcode-based
-    /** set a new barcode and update the HepMcParticleLink  */
-    void setBarcodeAndUpdateHepMcParticleLink(int bc); // FIXME barcode-based TODO Update this method to use the unique ID rather than the barcode.
 
     /** unique ID */
     int id() const;

Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFTruthIncident.h

@@ -96,8 +96,6 @@ namespace ISF {
         simulation) - TODO only a dummy implementation currently */
     virtual HepMC::GenParticlePtr     updateChildParticle(unsigned short index,
                                                           HepMC::GenParticlePtr existingChild) const override final;
-    /** Set the the barcode of all child particles to the given bc */
-    void                      setAllChildrenBarcodes(int bc) override final;
   private:
     ISFTruthIncident();
 

Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ITruthIncident.h

@@ -114,8 +114,6 @@ namespace ISF {
         simulation). */
     virtual HepMC::GenParticlePtr     updateChildParticle(unsigned short index,
                                                           HepMC::GenParticlePtr existingChild) const = 0;
-    /** Set the the barcode of all child particles to the given bc */
-    virtual void                      setAllChildrenBarcodes(int bc) = 0;
 
     /** Record that a particular child passed a check */
     inline void                       setChildPassedFilters(unsigned short index);

Simulation/ISF/ISF_Core/ISF_Event/src/ISFParticle.cxx

@@ -267,18 +267,3 @@ bool ISF::ISFParticle::isIdent(const ISF::ISFParticle& rhs) const
   pass &= m_partLink == rhs.getParticleLink();
   return pass;
 }
-
-void ISF::ISFParticle::setBarcodeAndUpdateHepMcParticleLink( int bc) {
-  // set a new barcode
-  setBarcode(bc);
-
-  //creating/changing the ISFParticle's HepMcParticleLink
-  HepMcParticleLink* newHMPL = nullptr;
-  if (m_partLink) {
-    newHMPL = new HepMcParticleLink(bc, m_partLink->eventIndex(), HepMcParticleLink::IS_EVENTNUM, HepMcParticleLink::IS_BARCODE); // FIXME barcode-based
-    delete m_partLink;
-  } else {
-    newHMPL = new HepMcParticleLink(bc, 0, HepMcParticleLink::IS_EVENTNUM, HepMcParticleLink::IS_BARCODE); // FIXME barcode-based
-  }
-  m_partLink = newHMPL;
-}

Simulation/ISF/ISF_Core/ISF_Event/src/ISFTruthIncident.cxx

@@ -164,19 +164,6 @@ HepMC::GenParticlePtr ISF::ISFTruthIncident::updateChildParticle(unsigned short
   return existingChild;
 }
 
-void ISF::ISFTruthIncident::setAllChildrenBarcodes(int bc) {
-  unsigned short numSec = numberOfChildren();
-  for (unsigned short i=0; i<numSec; i++) {
-    // the current particle
-    ISF::ISFParticle *p = m_children[i];
-
-    // set a new barcode and update the ISFParticle's HMPL
-    p->setBarcodeAndUpdateHepMcParticleLink(bc);
-  }
-
-  return;
-}
-
 
 /** return attached truth particle */
 HepMC::GenParticlePtr ISF::ISFTruthIncident::getHepMCTruthParticle( ISF::ISFParticle& particle ) const {

Simulation/ISF/ISF_Core/ISF_Event/test/ISFTruthIncident_test.cxx

@@ -330,17 +330,6 @@ namespace MCTesting {
 
   }
 
-  TEST_F(ISFTruthIncident_test, testSetAllChildrenBarcodes) {
-
-    int newBarcode = 42;
-    unsigned short numSec = m_truthIncident->numberOfChildren();
-    m_truthIncident->setAllChildrenBarcodes(newBarcode);
-    for (unsigned short index=0; index<numSec; index++) {
-      ASSERT_EQ(m_truthIncident->childBarcode(index), newBarcode);
-    }
-
-  }
-
 } // <-- namespace MCTesting
 
 

Simulation/ISF/ISF_Core/ISF_Services/src/TruthSvc.cxx

@@ -190,8 +190,6 @@ void ISF::TruthSvc::registerTruthIncident( ISF::ITruthIncident& ti, bool saveAll
 
     }
 
-    //  -> assign shared barcode to all child particles (if barcode service supports it)
-    setSharedChildParticleBarcode( ti);
   }
 
   return;
@@ -360,21 +358,3 @@ HepMC::GenVertexPtr  ISF::TruthSvc::createGenVertexFromTruthIncident( ISF::ITrut
 
   return parent->end_vertex();
 }
-
-/** Set shared barcode for child particles particles */
-void ISF::TruthSvc::setSharedChildParticleBarcode( ISF::ITruthIncident& ti) const {
-  int processCode = ti.physicsProcessCode();
-  int       parentBC = ti.parentBarcode();
-
-  ATH_MSG_VERBOSE ( "End Vertex representing process: " << processCode << ". TruthIncident failed cuts. Skipping.");
-
-  // generate one new barcode for all child particles
-  int childBC = m_barcodeSvc->sharedChildBarcode( parentBC, processCode);
-
-  // propagate this barcode into the TruthIncident only if
-  // it is a proper barcode, ie !=fUndefinedBarcode
-  if (childBC != HepMC::UNDEFINED_ID) {
-    ti.setAllChildrenBarcodes( childBC );
-  }
-}
-

Simulation/ISF/ISF_Core/ISF_Services/src/TruthSvc.h

@@ -80,9 +80,6 @@ namespace ISF {
     /** Record and end vertex to the MC Truth for the parent particle */
     HepMC::GenVertexPtr  createGenVertexFromTruthIncident( ITruthIncident& truthincident) const;
 
-    /** Set shared barcode for child particles */
-    void setSharedChildParticleBarcode( ITruthIncident& truthincident) const;
-
     ServiceHandle<Barcode::IBarcodeSvc> m_barcodeSvc{this, "BarcodeSvc", "BarcodeSvc", ""};           //!< The Barcode service
 
     /** the truth strategies applied (as AthenaToolHandle Array) */

Simulation/ISF/ISF_Core/ISF_Services/test/TruthSvc_test.cxx

@@ -127,8 +127,6 @@ namespace ISFTesting {
         simulation). */
     virtual HepMC::GenParticlePtr        updateChildParticle(unsigned short,
                                                           HepMC::GenParticlePtr ) const override {return nullptr;};
-    /** Set the the barcode of all child particles to the given bc */
-    virtual void                      setAllChildrenBarcodes(int) override {};
   private:
     const HepMC::FourVector m_myPosition{0.0, 40.0, 0.0, 40.0};
   };
@@ -408,13 +406,6 @@ namespace ISFTesting {
     anEvent->set_beam_particles(inParticle1,inParticle2);
 
     MockTruthIncident ti(AtlasDetDescr::fAtlasID, 2);
-    EXPECT_CALL(ti, physicsProcessCode())
-      .Times(1)
-      .WillOnce(::testing::Return(21));
-    EXPECT_CALL(ti, parentBarcode())
-      .Times(1)
-      .WillOnce(::testing::Return(HepMC::barcode(inParticle3)));
-
     registerTruthIncident(ti);
     HepMC::GenVertexPtr  generated = HepMC::barcode_to_vertex(anEvent.get(),-200001); //Find a nicer way to get this.
     HepMC::GenVertexPtr  expectedVtx(nullptr);
@@ -456,12 +447,10 @@ namespace ISFTesting {
     MockTruthIncident ti(AtlasDetDescr::fAtlasID, 2);
     HepMC::FourVector vtxPosition(0.0, 40.0, 0.0, 40.0);
     EXPECT_CALL(ti, physicsProcessCode())
-      .Times(2)
-      .WillOnce(::testing::Return(21))
+      .Times(1)
       .WillOnce(::testing::Return(21));
     EXPECT_CALL(ti, parentBarcode())
-      .Times(2)
-      .WillOnce(::testing::Return(HepMC::barcode(inParticle3)))
+      .Times(1)
       .WillOnce(::testing::Return(HepMC::barcode(inParticle3)));
     EXPECT_CALL(ti, parentParticle())
       .Times(1)
@@ -532,12 +521,10 @@ namespace ISFTesting {
     MockTruthIncident ti(AtlasDetDescr::fAtlasID, 2);
     HepMC::FourVector vtxPosition(0.0, 40.0, 0.0, 40.0);
     EXPECT_CALL(ti, physicsProcessCode())
-      .Times(2)
-      .WillOnce(::testing::Return(21))
+      .Times(1)
       .WillOnce(::testing::Return(21));
     EXPECT_CALL(ti, parentBarcode())
-      .Times(2)
-      .WillOnce(::testing::Return(HepMC::barcode(inParticle3)))
+      .Times(1)
       .WillOnce(::testing::Return(HepMC::barcode(inParticle3)));
     EXPECT_CALL(ti, parentParticle())
       .Times(1)

Simulation/ISF/ISF_Geant4/ISF_Geant4Event/ISF_Geant4Event/Geant4TruthIncident.h

@@ -86,8 +86,6 @@ namespace iGeant4 {
       int                       childPdgCode(unsigned short index) const override final;
       /** Return the barcode of the i-th child particle (if defined as part of the TruthIncident) otherwise return 0 */
       int  childBarcode(unsigned short index) const override final; // TODO Remove - only used in one place in TruthSvc
-      /** Set the the barcode of all child particles to the given bc */
-      void                      setAllChildrenBarcodes(int bc) override final;
 
       /**  The interaction classifications are described as follows:
            STD_VTX: interaction of a particle without a pre-defined decay;

Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/Geant4TruthIncident.cxx

@@ -226,12 +226,6 @@ int  iGeant4::Geant4TruthIncident::childBarcode(unsigned short index) const {
   return 0;
 }
 
-void iGeant4::Geant4TruthIncident::setAllChildrenBarcodes(int) {
-  G4ExceptionDescription description;
-  description << G4String("setAllChildrenBarcodes: ") + "Shared child particle barcodes are not implemented in ISF_Geant4 at this point.";
-  G4Exception("iGeant4::Geant4TruthIncident", "NotImplemented", FatalException, description);
-}
-
 HepMC::GenParticlePtr iGeant4::Geant4TruthIncident::childParticle(unsigned short i,
                                                                   int newBarcode) {
   // the G4Track instance for the current child particle