* add instantiation of fresh instances of GlueXPhotonBeamGenerator

rjones30 · rjones30 · commit 43e6a133290c · 2020-08-28T14:27:26.000-04:00
for each worker thread action object [rtj]
diff --git a/src/GlueXPrimaryGeneratorAction.cc b/src/GlueXPrimaryGeneratorAction.cc
@@ -79,6 +79,7 @@ GlueXPrimaryGeneratorAction::GlueXPrimaryGeneratorAction()
    fParticleGun = new GlueXParticleGun();
 
    if (fSourceType == SOURCE_TYPE_HDDM) {
+      clone_photon_beam_generator();
       fPrimaryGenerator = new GlueXPrimaryGenerator(fHDDMistream);
       return;
    }
@@ -493,7 +494,7 @@ GlueXPrimaryGeneratorAction &GlueXPrimaryGeneratorAction::operator=(const
    else if (fSourceType == SOURCE_TYPE_PARTICLE_GUN) {
       fParticleGun->SetParticleDefinition(fGunParticle.partDef);
    }
-   if (fPhotonBeamGenerator) {
+   if (src.fPhotonBeamGenerator) {
       clone_photon_beam_generator();
    }
    fBeamvertex = src.fBeamvertex;

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ GlueXPrimaryGeneratorAction::GlueXPrimaryGeneratorAction()`
`79`	`79`	`fParticleGun = new GlueXParticleGun();`
`80`	`80`
`81`	`81`	`if (fSourceType == SOURCE_TYPE_HDDM) {`
	`82`	`+ clone_photon_beam_generator();`
`82`	`83`	`fPrimaryGenerator = new GlueXPrimaryGenerator(fHDDMistream);`
`83`	`84`	`return;`
`84`	`85`	`}`
`@@ -493,7 +494,7 @@ GlueXPrimaryGeneratorAction &GlueXPrimaryGeneratorAction::operator=(const`
`493`	`494`	`else if (fSourceType == SOURCE_TYPE_PARTICLE_GUN) {`
`494`	`495`	`fParticleGun->SetParticleDefinition(fGunParticle.partDef);`
`495`	`496`	`}`
`496`		`- if (fPhotonBeamGenerator) {`
	`497`	`+ if (src.fPhotonBeamGenerator) {`
`497`	`498`	`clone_photon_beam_generator();`
`498`	`499`	`}`
`499`	`500`	`fBeamvertex = src.fBeamvertex;`