Skip to content

Commit 0d3506c

Browse files
committed
Release 0.2.3 - New CxxWrap, fixed exports
1 parent 5e4b1b3 commit 0d3506c

File tree

4 files changed

+102
-96
lines changed

4 files changed

+102
-96
lines changed

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "Geant4"
22
uuid = "559df036-b7a0-42fd-85df-7d5dd9d70f44"
33
authors = ["Pere Mato <pere.mato@cern.ch>"]
4-
version = "0.2.2"
4+
version = "0.2.3"
55

66
[deps]
77
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
@@ -30,9 +30,9 @@ G4Vis = ["Makie", "Colors", "StaticArrays", "Rotations", "LinearAlgebra", "IGLWr
3030
[compat]
3131
CSV = "0.10"
3232
Colors = "0.12.9, 0.13"
33-
CxxWrap = "0.16, 0.17"
33+
CxxWrap = "0.17"
3434
FHist = "0.11"
35-
Geant4_julia_jll = "0.2"
35+
Geant4_julia_jll = "0.3"
3636
GeometryBasics = "0.5"
3737
IGLWrap_jll = "2.6.0"
3838
Makie = "0.22, 0.23"

docs/src/releases.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## Release Notes
22

3+
### 0.2.3 - 29-Aug-2025
4+
- New Features:
5+
- Upgraded to CxxWrap version 0,17
6+
- Fixes:
7+
- #37 Removed from exports the ones clashing with `Base`: "length", "size", "angle", "decompose", "contains"
8+
39
### 0.2.2 - 20-June-2025
410
- New Features:
511
- Using new version of Geant4_jll v11.3.2

gen/Geant4.wit.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,5 +169,5 @@ export = "all"
169169
veto_list = "Geant4-veto.h"
170170
cxx-std = "c++17"
171171
inheritances = [ ]
172-
export_blacklist = ["length"]
172+
export_blacklist = ["length", "size", "angle", "decompose", "contains"]
173173
cxxwrap_version = "@CxxWrap_VERSION@"

gen/jlGeant4-report.txt

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -57,45 +57,8 @@ std::queue<long,std::deque<long,std::allocator<long>>>
5757

5858
Auto-vetoed functions
5959
---------------------
60-
std::ostream & operator<<(std::ostream &, const G4AffineTransform &)
61-
std::ostream & CLHEP::HepRandomEngine::put(std::ostream &)
62-
std::istream & CLHEP::HepRandomEngine::get(std::istream &)
63-
std::istream & CLHEP::HepRandomEngine::getState(std::istream &)
64-
CLHEP::HepRandomEngine * CLHEP::HepRandomEngine::newEngine(std::istream &)
65-
std::ostream & CLHEP::operator<<(std::ostream &, const CLHEP::HepRandomEngine &)
66-
std::istream & CLHEP::operator>>(std::istream &, CLHEP::HepRandomEngine &)
67-
G4int G4MTRunManager::SetUpNEvents(G4Event *, G4SeedsQueue *, G4bool)
68-
G4MTRunManager::masterWorlds_t & G4MTRunManager::GetMasterWorlds()
69-
void G4MTRunManager::SetUserInitialization(G4UserWorkerThreadInitialization *)
70-
void G4Ellipsoid::G4Ellipsoid(__void__ &)
71-
G4bool G4VCSGfaceted::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
72-
std::ostream & G4VCSGfaceted::StreamInfo(std::ostream &)
73-
void G4VCSGfaceted::DescribeYourselfTo(G4VGraphicsScene &)
74-
G4VisExtent G4VCSGfaceted::GetExtent()
75-
void G4VCSGfaceted::G4VCSGfaceted(__void__ &)
76-
G4bool G4Polycone::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
77-
std::ostream & G4Polycone::StreamInfo(std::ostream &)
78-
void G4Polycone::G4Polycone(__void__ &)
79-
G4bool G4Polyhedra::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
80-
std::ostream & G4Polyhedra::StreamInfo(std::ostream &)
81-
void G4Polyhedra::G4Polyhedra(__void__ &)
82-
G4bool G4Torus::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
83-
std::ostream & G4Torus::StreamInfo(std::ostream &)
84-
void G4Torus::DescribeYourselfTo(G4VGraphicsScene &)
85-
void G4Torus::G4Torus(__void__ &)
86-
G4bool G4Para::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
87-
std::ostream & G4Para::StreamInfo(std::ostream &)
88-
void G4Para::DescribeYourselfTo(G4VGraphicsScene &)
89-
void G4Para::G4Para(__void__ &)
90-
G4bool G4Hype::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
91-
std::ostream & G4Hype::StreamInfo(std::ostream &)
92-
void G4Hype::DescribeYourselfTo(G4VGraphicsScene &)
93-
G4VisExtent G4Hype::GetExtent()
94-
void G4Hype::G4Hype(__void__ &)
95-
G4bool G4Tubs::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
96-
std::ostream & G4Tubs::StreamInfo(std::ostream &)
97-
void G4Tubs::DescribeYourselfTo(G4VGraphicsScene &)
98-
void G4Tubs::G4Tubs(__void__ &)
60+
void G4LogicalVolume::G4LogicalVolume(__void__ &)
61+
const G4LVManager & G4LogicalVolume::GetSubInstanceManager()
9962
G4Pid_t G4Threading::G4GetPidId()
10063
G4bool G4Threading::G4SetPinAffinity(G4int, G4NativeThread &)
10164
void G4ParticleDefinition::G4ParticleDefinition(const G4String &, G4double, G4double, G4double, G4int, G4int, G4int, G4int, G4int, G4int, const G4String &, G4int, G4int, G4int, G4bool, G4double, G4DecayTable *, G4bool, const G4String &, G4int, G4double)
@@ -110,12 +73,13 @@ const G4ChordFinder * G4FieldManager::GetChordFinder()
11073
G4Allocator<G4HCofThisEvent> *& anHCoTHAllocator_G4MT_TLS_()
11174
std::ostream & CLHEP::operator<<(std::ostream &, const CLHEP::Hep3Vector &)
11275
std::istream & CLHEP::operator>>(std::istream &, CLHEP::Hep3Vector &)
113-
std::ostream & CLHEP::HepRotation::print(std::ostream &)
114-
std::ostream & CLHEP::operator<<(std::ostream &, const CLHEP::HepRotation &)
115-
void G4VPhysicalVolume::G4VPhysicalVolume(__void__ &)
116-
const G4PVManager & G4VPhysicalVolume::GetSubInstanceManager()
117-
void G4LogicalVolume::G4LogicalVolume(__void__ &)
118-
const G4LVManager & G4LogicalVolume::GetSubInstanceManager()
76+
std::ostream & operator<<(std::ostream &, const G4AffineTransform &)
77+
const std::map<G4Material *,G4double> & G4Material::GetMatComponents()
78+
void G4Track::SetAuxiliaryTrackInformation(G4int, G4VAuxiliaryTrackInformation *)
79+
G4VAuxiliaryTrackInformation * G4Track::GetAuxiliaryTrackInformation(G4int)
80+
std::map<G4int,G4VAuxiliaryTrackInformation *> * G4Track::GetAuxiliaryTrackInformationMap()
81+
void G4VUserDetectorConstruction::RegisterParallelWorld(G4VUserParallelWorld *)
82+
G4VUserParallelWorld * G4VUserDetectorConstruction::GetParallelWorld(G4int)
11983
G4VUserPrimaryParticleInformation * G4PrimaryParticle::GetUserInformation()
12084
void G4PrimaryParticle::SetUserInformation(G4VUserPrimaryParticleInformation *)
12185
G4Allocator<G4PrimaryParticle> *& aPrimaryParticleAllocator()
@@ -133,6 +97,12 @@ void G4VTrajectory::ShowTrajectory(std::ostream &)
13397
const std::map<G4String,G4AttDef> * G4VTrajectory::GetAttDefs()
13498
G4Allocator<G4TrajectoryContainer> *& aTrajectoryContainerAllocator()
13599
G4Allocator<G4Event> *& anEventAllocator()
100+
std::ostream & CLHEP::HepRandomEngine::put(std::ostream &)
101+
std::istream & CLHEP::HepRandomEngine::get(std::istream &)
102+
std::istream & CLHEP::HepRandomEngine::getState(std::istream &)
103+
CLHEP::HepRandomEngine * CLHEP::HepRandomEngine::newEngine(std::istream &)
104+
std::ostream & CLHEP::operator<<(std::ostream &, const CLHEP::HepRandomEngine &)
105+
std::istream & CLHEP::operator>>(std::istream &, CLHEP::HepRandomEngine &)
136106
std::ostream & CLHEP::HepRandom::put(std::ostream &)
137107
std::istream & CLHEP::HepRandom::get(std::istream &)
138108
std::ostream & CLHEP::HepRandom::saveFullState(std::ostream &)
@@ -166,9 +136,6 @@ std::istream & CLHEP::RandGeneral::get(std::istream &)
166136
std::ostream & CLHEP::RandPoissonQ::put(std::ostream &)
167137
std::istream & CLHEP::RandPoissonQ::get(std::istream &)
168138
void G4VProcess::ProcessDescription(std::ostream &)
169-
void G4RunManager::SetUserInitialization(G4UserWorkerThreadInitialization *)
170-
const G4UserWorkerThreadInitialization * G4RunManager::GetUserWorkerThreadInitialization()
171-
void G4RunManager::SetDCtable(G4DCtable *)
172139
void G4MTRunManagerKernel::StartThread(G4WorkerThread *)
173140
G4WorkerThread * G4MTRunManagerKernel::GetWorkerThread()
174141
G4UIcommandTree * G4UImanager::GetTree()
@@ -180,6 +147,13 @@ void G4UImanager::SetG4UIWindow(G4UIsession *const)
180147
void G4UImanager::SetCoutDestination(G4UIsession *const)
181148
void G4UImanager::RegisterBridge(G4UIbridge *)
182149
G4MTcoutDestination * G4UImanager::GetThreadCout()
150+
std::ostream & G4CSGSolid::StreamInfo(std::ostream &)
151+
void G4CSGSolid::G4CSGSolid(__void__ &)
152+
void G4PVPlacement::G4PVPlacement(__void__ &)
153+
void G4PVReplica::G4PVReplica(__void__ &)
154+
const G4PVRManager & G4PVReplica::GetSubInstanceManager()
155+
G4PropagatorInField * G4TransportationManager::GetPropagatorInField()
156+
void G4TransportationManager::SetPropagatorInField(G4PropagatorInField *)
183157
std::vector<G4Navigator *>::iterator G4TransportationManager::GetActiveNavigatorsIterator()
184158
std::vector<G4VPhysicalVolume *>::iterator G4TransportationManager::GetWorldsIterator()
185159
G4bool G4Box::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
@@ -194,9 +168,28 @@ G4bool G4MultiUnion::CalculateExtent(const EAxis, const G4VoxelLimits &, const G
194168
std::ostream & G4MultiUnion::StreamInfo(std::ostream &)
195169
void G4MultiUnion::DescribeYourselfTo(G4VGraphicsScene &)
196170
void G4MultiUnion::G4MultiUnion(__void__ &)
197-
void G4OpticalSurface::ReadCompressedFile(const G4String &, std::istringstream &)
198-
const G4LogicalBorderSurfaceTable * G4LogicalBorderSurface::GetSurfaceTable()
199-
const G4LogicalSkinSurfaceTable * G4LogicalSkinSurface::GetSurfaceTable()
171+
G4bool G4Trd::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
172+
std::ostream & G4Trd::StreamInfo(std::ostream &)
173+
void G4Trd::DescribeYourselfTo(G4VGraphicsScene &)
174+
void G4Trd::G4Trd(__void__ &)
175+
G4bool G4Trap::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
176+
std::ostream & G4Trap::StreamInfo(std::ostream &)
177+
void G4Trap::DescribeYourselfTo(G4VGraphicsScene &)
178+
void G4Trap::G4Trap(__void__ &)
179+
G4bool G4Cons::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
180+
std::ostream & G4Cons::StreamInfo(std::ostream &)
181+
void G4Cons::DescribeYourselfTo(G4VGraphicsScene &)
182+
void G4Cons::G4Cons(__void__ &)
183+
G4bool G4Sphere::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
184+
std::ostream & G4Sphere::StreamInfo(std::ostream &)
185+
G4VisExtent G4Sphere::GetExtent()
186+
void G4Sphere::DescribeYourselfTo(G4VGraphicsScene &)
187+
void G4Sphere::G4Sphere(__void__ &)
188+
G4bool G4Orb::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
189+
std::ostream & G4Orb::StreamInfo(std::ostream &)
190+
void G4Orb::DescribeYourselfTo(G4VGraphicsScene &)
191+
G4VisExtent G4Orb::GetExtent()
192+
void G4Orb::G4Orb(__void__ &)
200193
const G4VUPLManager & G4VUserPhysicsList::GetSubInstanceManager()
201194
const G4VUPLManager & G4VUserPhysicsList::GetSubInstanceManager()
202195
const G4VMPLManager & G4VModularPhysicsList::GetSubInstanceManager()
@@ -269,56 +262,63 @@ void G4IntersectionSolid::DescribeYourselfTo(G4VGraphicsScene &)
269262
const std::map<G4String,G4Colour> & G4Colour::GetMap()
270263
void G4VisAttributes::SetAttDefs(const std::map<G4String,G4AttDef> *)
271264
const std::map<G4String,G4AttDef> * G4VisAttributes::GetAttDefs()
272-
const std::map<G4Material *,G4double> & G4Material::GetMatComponents()
273-
void G4Track::SetAuxiliaryTrackInformation(G4int, G4VAuxiliaryTrackInformation *)
274-
G4VAuxiliaryTrackInformation * G4Track::GetAuxiliaryTrackInformation(G4int)
275-
std::map<G4int,G4VAuxiliaryTrackInformation *> * G4Track::GetAuxiliaryTrackInformationMap()
276-
G4bool G4Trd::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
277-
std::ostream & G4Trd::StreamInfo(std::ostream &)
278-
void G4Trd::DescribeYourselfTo(G4VGraphicsScene &)
279-
void G4Trd::G4Trd(__void__ &)
280-
G4bool G4Trap::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
281-
std::ostream & G4Trap::StreamInfo(std::ostream &)
282-
void G4Trap::DescribeYourselfTo(G4VGraphicsScene &)
283-
void G4Trap::G4Trap(__void__ &)
284-
G4bool G4Cons::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
285-
std::ostream & G4Cons::StreamInfo(std::ostream &)
286-
void G4Cons::DescribeYourselfTo(G4VGraphicsScene &)
287-
void G4Cons::G4Cons(__void__ &)
288-
G4bool G4Sphere::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
289-
std::ostream & G4Sphere::StreamInfo(std::ostream &)
290-
G4VisExtent G4Sphere::GetExtent()
291-
void G4Sphere::DescribeYourselfTo(G4VGraphicsScene &)
292-
void G4Sphere::G4Sphere(__void__ &)
293-
G4bool G4Orb::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
294-
std::ostream & G4Orb::StreamInfo(std::ostream &)
295-
void G4Orb::DescribeYourselfTo(G4VGraphicsScene &)
296-
G4VisExtent G4Orb::GetExtent()
297-
void G4Orb::G4Orb(__void__ &)
298-
G4bool G4Ellipsoid::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
299-
std::ostream & G4Ellipsoid::StreamInfo(std::ostream &)
300-
void G4Ellipsoid::DescribeYourselfTo(G4VGraphicsScene &)
301-
G4VisExtent G4Ellipsoid::GetExtent()
265+
const G4GDMLAuxMapType * G4GDMLParser::GetAuxMap()
266+
void G4OpticalParameters::StreamInfo(std::ostream &)
267+
void G4OpticalSurface::ReadCompressedFile(const G4String &, std::istringstream &)
268+
const G4LogicalBorderSurfaceTable * G4LogicalBorderSurface::GetSurfaceTable()
269+
const G4LogicalSkinSurfaceTable * G4LogicalSkinSurface::GetSurfaceTable()
302270
void G4ScoringManager::RegisterScoreColorMap(G4VScoreColorMap *)
303271
G4VScoreColorMap * G4ScoringManager::GetScoreColorMap(const G4String &)
304272
const std::map<G4String,G4AttDef> * G4VTrajectoryPoint::GetAttDefs()
273+
std::ostream & CLHEP::HepRotation::print(std::ostream &)
274+
std::ostream & CLHEP::operator<<(std::ostream &, const CLHEP::HepRotation &)
275+
void G4VPhysicalVolume::G4VPhysicalVolume(__void__ &)
276+
const G4PVManager & G4VPhysicalVolume::GetSubInstanceManager()
305277
G4bool G4VSolid::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
306278
std::ostream & G4VSolid::StreamInfo(std::ostream &)
307279
void G4VSolid::DescribeYourselfTo(G4VGraphicsScene &)
308280
G4VisExtent G4VSolid::GetExtent()
309281
void G4VSolid::G4VSolid(__void__ &)
310282
std::ostream & operator<<(std::ostream &, const G4VSolid &)
311-
void G4VUserDetectorConstruction::RegisterParallelWorld(G4VUserParallelWorld *)
312-
G4VUserParallelWorld * G4VUserDetectorConstruction::GetParallelWorld(G4int)
313-
std::ostream & G4CSGSolid::StreamInfo(std::ostream &)
314-
void G4CSGSolid::G4CSGSolid(__void__ &)
315-
void G4PVPlacement::G4PVPlacement(__void__ &)
316-
void G4PVReplica::G4PVReplica(__void__ &)
317-
const G4PVRManager & G4PVReplica::GetSubInstanceManager()
318-
G4PropagatorInField * G4TransportationManager::GetPropagatorInField()
319-
void G4TransportationManager::SetPropagatorInField(G4PropagatorInField *)
320-
const G4GDMLAuxMapType * G4GDMLParser::GetAuxMap()
321-
void G4OpticalParameters::StreamInfo(std::ostream &)
283+
void G4RunManager::SetUserInitialization(G4UserWorkerThreadInitialization *)
284+
const G4UserWorkerThreadInitialization * G4RunManager::GetUserWorkerThreadInitialization()
285+
void G4RunManager::SetDCtable(G4DCtable *)
286+
G4int G4MTRunManager::SetUpNEvents(G4Event *, G4SeedsQueue *, G4bool)
287+
G4MTRunManager::masterWorlds_t & G4MTRunManager::GetMasterWorlds()
288+
void G4MTRunManager::SetUserInitialization(G4UserWorkerThreadInitialization *)
289+
G4bool G4Ellipsoid::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
290+
std::ostream & G4Ellipsoid::StreamInfo(std::ostream &)
291+
void G4Ellipsoid::DescribeYourselfTo(G4VGraphicsScene &)
292+
G4VisExtent G4Ellipsoid::GetExtent()
293+
void G4Ellipsoid::G4Ellipsoid(__void__ &)
294+
G4bool G4VCSGfaceted::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
295+
std::ostream & G4VCSGfaceted::StreamInfo(std::ostream &)
296+
void G4VCSGfaceted::DescribeYourselfTo(G4VGraphicsScene &)
297+
G4VisExtent G4VCSGfaceted::GetExtent()
298+
void G4VCSGfaceted::G4VCSGfaceted(__void__ &)
299+
G4bool G4Polycone::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
300+
std::ostream & G4Polycone::StreamInfo(std::ostream &)
301+
void G4Polycone::G4Polycone(__void__ &)
302+
G4bool G4Polyhedra::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
303+
std::ostream & G4Polyhedra::StreamInfo(std::ostream &)
304+
void G4Polyhedra::G4Polyhedra(__void__ &)
305+
G4bool G4Torus::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
306+
std::ostream & G4Torus::StreamInfo(std::ostream &)
307+
void G4Torus::DescribeYourselfTo(G4VGraphicsScene &)
308+
void G4Torus::G4Torus(__void__ &)
309+
G4bool G4Para::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
310+
std::ostream & G4Para::StreamInfo(std::ostream &)
311+
void G4Para::DescribeYourselfTo(G4VGraphicsScene &)
312+
void G4Para::G4Para(__void__ &)
313+
G4bool G4Hype::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
314+
std::ostream & G4Hype::StreamInfo(std::ostream &)
315+
void G4Hype::DescribeYourselfTo(G4VGraphicsScene &)
316+
G4VisExtent G4Hype::GetExtent()
317+
void G4Hype::G4Hype(__void__ &)
318+
G4bool G4Tubs::CalculateExtent(const EAxis, const G4VoxelLimits &, const G4AffineTransform &, G4double &, G4double &)
319+
std::ostream & G4Tubs::StreamInfo(std::ostream &)
320+
void G4Tubs::DescribeYourselfTo(G4VGraphicsScene &)
321+
void G4Tubs::G4Tubs(__void__ &)
322322

323323
Class(es) from vetoed_finalizer_classes configuration parameter that were not found:
324324
-------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)