Import Geant4 11.3.0 source tree
This commit is contained in:
@@ -6,6 +6,18 @@ It must **not** be used as a substitute for writing good git commit messages!
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
## 2024-10-28 Ben Morgan (particles-V11-02-01)
|
||||
- Apply [GitHub PR 74](https://github.com/Geant4/geant4/pull/74), fixing bug in
|
||||
`G4ParticleMessenger` that never updated the currently selected particle.
|
||||
- Simplified logic in patch to remove local static.
|
||||
|
||||
## 2024-08-01 Alberto Ribon (particles-V11-02-00)
|
||||
- G4ChargedUnknownParticle : new class, similar to G4UnknownParticle for
|
||||
charged unknown particles.
|
||||
( This is part of ATLAS and LHCb request to assign automatically
|
||||
ionisation and multiple scattering processes to charged primary particles
|
||||
with valid PDG code but not known to Geant4. )
|
||||
|
||||
## 2023-11-20 Vladimir Ivanchenko (particles-V11-01-10)
|
||||
- G4IonTable - fixed run time memory leak by change of signature of GetIonName(..)
|
||||
methods - now they return G4String instead of a reference to a string, code
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
//
|
||||
// ********************************************************************
|
||||
// * License and Disclaimer *
|
||||
// * *
|
||||
// * The Geant4 software is copyright of the Copyright Holders of *
|
||||
// * the Geant4 Collaboration. It is provided under the terms and *
|
||||
// * conditions of the Geant4 Software License, included in the file *
|
||||
// * LICENSE and available at http://cern.ch/geant4/license . These *
|
||||
// * include a list of copyright holders. *
|
||||
// * *
|
||||
// * Neither the authors of this software system, nor their employing *
|
||||
// * institutes,nor the agencies providing financial support for this *
|
||||
// * work make any representation or warranty, express or implied, *
|
||||
// * regarding this software system or assume any liability for its *
|
||||
// * use. Please see the license in the file LICENSE and URL above *
|
||||
// * for the full disclaimer and the limitation of liability. *
|
||||
// * *
|
||||
// * This code implementation is the result of the scientific and *
|
||||
// * technical work of the GEANT4 collaboration. *
|
||||
// * By using, copying, modifying or distributing the software (or *
|
||||
// * any work based on the software) you agree to acknowledge its *
|
||||
// * use in resulting scientific publications, and indicate your *
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// --------------------------------------------------------------------------
|
||||
//
|
||||
// GEANT4 header file
|
||||
//
|
||||
// File name: G4ChargedUnknownParticle.hh
|
||||
//
|
||||
// Author: A.Ribon
|
||||
//
|
||||
// Creation date: August 2024
|
||||
//
|
||||
// Description: This class is similar to G4UnknownParticle,
|
||||
// i.e. representing particles with valid PDG code but
|
||||
// unknown to Geant4 - e.g. produced by MC event
|
||||
// generators - but with the extra requirement of having
|
||||
// a non-zero electric charge.
|
||||
// While for G4UnknownParticle is possible to assign
|
||||
// transportation and decay processes, for
|
||||
// G4ChargedUnknownParticle is also possible to assign
|
||||
// ionisation and multiple scattering.
|
||||
//
|
||||
// Modifications:
|
||||
//
|
||||
// --------------------------------------------------------------------------
|
||||
//
|
||||
|
||||
#ifndef G4ChargedUnknownParticle_h
|
||||
#define G4ChargedUnknownParticle_h 1
|
||||
|
||||
#include "G4ParticleDefinition.hh"
|
||||
|
||||
|
||||
class G4ChargedUnknownParticle : public G4ParticleDefinition {
|
||||
public:
|
||||
static G4ChargedUnknownParticle* Definition();
|
||||
static G4ChargedUnknownParticle* ChargedUnknownParticleDefinition();
|
||||
static G4ChargedUnknownParticle* ChargedUnknownParticle();
|
||||
private:
|
||||
G4ChargedUnknownParticle() = default;
|
||||
~G4ChargedUnknownParticle() = default;
|
||||
static G4ChargedUnknownParticle* theInstance;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -5,22 +5,24 @@ geant4_add_module(G4bosons
|
||||
PUBLIC_HEADERS
|
||||
G4BosonConstructor.hh
|
||||
G4ChargedGeantino.hh
|
||||
G4ChargedUnknownParticle.hh
|
||||
G4Gamma.hh
|
||||
G4Geantino.hh
|
||||
G4OpticalPhoton.hh
|
||||
G4PhononLong.hh
|
||||
G4PhononTransFast.hh
|
||||
G4PhononTransSlow.hh
|
||||
G4PhononLong.hh
|
||||
G4PhononTransFast.hh
|
||||
G4PhononTransSlow.hh
|
||||
G4UnknownParticle.hh
|
||||
SOURCES
|
||||
G4BosonConstructor.cc
|
||||
G4ChargedGeantino.cc
|
||||
G4ChargedUnknownParticle.cc
|
||||
G4Gamma.cc
|
||||
G4Geantino.cc
|
||||
G4OpticalPhoton.cc
|
||||
G4PhononLong.cc
|
||||
G4PhononTransFast.cc
|
||||
G4PhononTransSlow.cc
|
||||
G4PhononLong.cc
|
||||
G4PhononTransFast.cc
|
||||
G4PhononTransSlow.cc
|
||||
G4UnknownParticle.cc)
|
||||
|
||||
geant4_module_link_libraries(G4bosons PUBLIC G4partman PRIVATE G4globman)
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
//
|
||||
// ********************************************************************
|
||||
// * License and Disclaimer *
|
||||
// * *
|
||||
// * The Geant4 software is copyright of the Copyright Holders of *
|
||||
// * the Geant4 Collaboration. It is provided under the terms and *
|
||||
// * conditions of the Geant4 Software License, included in the file *
|
||||
// * LICENSE and available at http://cern.ch/geant4/license . These *
|
||||
// * include a list of copyright holders. *
|
||||
// * *
|
||||
// * Neither the authors of this software system, nor their employing *
|
||||
// * institutes,nor the agencies providing financial support for this *
|
||||
// * work make any representation or warranty, express or implied, *
|
||||
// * regarding this software system or assume any liability for its *
|
||||
// * use. Please see the license in the file LICENSE and URL above *
|
||||
// * for the full disclaimer and the limitation of liability. *
|
||||
// * *
|
||||
// * This code implementation is the result of the scientific and *
|
||||
// * technical work of the GEANT4 collaboration. *
|
||||
// * By using, copying, modifying or distributing the software (or *
|
||||
// * any work based on the software) you agree to acknowledge its *
|
||||
// * use in resulting scientific publications, and indicate your *
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// --------------------------------------------------------------------------
|
||||
//
|
||||
// GEANT4 source file
|
||||
//
|
||||
// File name: G4ChargedUnknownParticle.cc
|
||||
//
|
||||
// Author: A.Ribon
|
||||
//
|
||||
// Creation date: August 2024
|
||||
//
|
||||
// Description: This class is similar to G4UnknownParticle,
|
||||
// i.e. representing particles with valid PDG code but
|
||||
// unknown to Geant4 - e.g. produced by MC event
|
||||
// generators - but with the extra requirement of having
|
||||
// a non-zero electric charge.
|
||||
// While for G4UnknownParticle is possible to assign
|
||||
// transportation and decay processes, for
|
||||
// G4ChargedUnknownParticle is also possible to assign
|
||||
// ionisation and multiple scattering.
|
||||
//
|
||||
// Modifications:
|
||||
//
|
||||
// --------------------------------------------------------------------------
|
||||
//
|
||||
|
||||
#include "G4ChargedUnknownParticle.hh"
|
||||
#include "G4ParticleTable.hh"
|
||||
#include "G4String.hh"
|
||||
#include "G4SystemOfUnits.hh"
|
||||
|
||||
|
||||
G4ChargedUnknownParticle* G4ChargedUnknownParticle::theInstance = nullptr;
|
||||
|
||||
|
||||
G4ChargedUnknownParticle* G4ChargedUnknownParticle::Definition() {
|
||||
if ( theInstance != nullptr ) return theInstance;
|
||||
const G4String name = "chargedunknown";
|
||||
G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
|
||||
G4ParticleDefinition* anInstance = pTable->FindParticle( name );
|
||||
if ( anInstance == nullptr ) {
|
||||
// Arguments for constructor are as follows
|
||||
// name mass width charge
|
||||
// 2*spin parity C-conjugation
|
||||
// 2*Isospin 2*Isospin3 G-parity
|
||||
// type lepton number baryon number PDG encoding
|
||||
// stable lifetime decay table
|
||||
// shortlived subType anti_encoding
|
||||
anInstance = new G4ParticleDefinition(
|
||||
name, 0.0*MeV, 0.0*MeV, +1.0*eplus,
|
||||
0, 0, 0,
|
||||
0, 0, 0,
|
||||
"geantino", 0, 0, 0,
|
||||
true, -1.0, nullptr,
|
||||
false, "geantino", 0
|
||||
);
|
||||
}
|
||||
theInstance = static_cast< G4ChargedUnknownParticle* >( anInstance );
|
||||
return theInstance;
|
||||
}
|
||||
|
||||
|
||||
G4ChargedUnknownParticle* G4ChargedUnknownParticle::ChargedUnknownParticleDefinition() {
|
||||
return Definition();
|
||||
}
|
||||
|
||||
|
||||
G4ChargedUnknownParticle* G4ChargedUnknownParticle::ChargedUnknownParticle() {
|
||||
return Definition();
|
||||
}
|
||||
@@ -94,7 +94,6 @@ class G4ParticleMessenger : public G4UImessenger
|
||||
G4UIcmdWithAnInteger* verboseCmd = nullptr;
|
||||
|
||||
G4ParticleTable* theParticleTable = nullptr;
|
||||
G4ParticleDefinition* currentParticle = nullptr;
|
||||
|
||||
G4ParticlePropertyMessenger* fParticlePropertyMessenger = nullptr;
|
||||
};
|
||||
|
||||
@@ -201,14 +201,8 @@ G4String G4ParticleMessenger::GetCurrentValue(G4UIcommand* command)
|
||||
}
|
||||
selectCmd->SetCandidates((const char*)(candidates));
|
||||
|
||||
static const G4String noName("none");
|
||||
// current value
|
||||
if (currentParticle == nullptr) {
|
||||
// no particle is selected. return null
|
||||
return noName;
|
||||
}
|
||||
|
||||
return currentParticle->GetParticleName();
|
||||
const G4ParticleDefinition* currentParticle = theParticleTable->GetSelectedParticle();
|
||||
return (currentParticle == nullptr) ? G4String("none") : currentParticle->GetParticleName();
|
||||
}
|
||||
if (command == verboseCmd) {
|
||||
// Command /particle/verbose
|
||||
|
||||
Reference in New Issue
Block a user