Merge pull request #172 from JeffersonLab/check_for_missing_PhotonBea…

…mGenerator_rtj * add checks that fPrimaryGenerator and fPhotonBeamGenerator are
JeffersonLab · Aug 10, 2020 · 6e3737e · 6e3737e
2 parents cd76220 + a13b7b7
commit 6e3737e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/GlueXPrimaryGeneratorAction.cc b/src/GlueXPrimaryGeneratorAction.cc
@@ -490,12 +490,12 @@ GlueXPrimaryGeneratorAction &GlueXPrimaryGeneratorAction::operator=(const
    if (fSourceType == SOURCE_TYPE_HDDM) {
       fPrimaryGenerator = new GlueXPrimaryGenerator(fHDDMistream);
    }
-   else if (fSourceType == SOURCE_TYPE_COBREMS_GEN) {
-      clone_photon_beam_generator();
-   }
    else if (fSourceType == SOURCE_TYPE_PARTICLE_GUN) {
       fParticleGun->SetParticleDefinition(fGunParticle.partDef);
    }
+   if (fPhotonBeamGenerator) {
+      clone_photon_beam_generator();
+   }
    fBeamvertex = src.fBeamvertex;
    fBeamvertex_activated = src.fBeamvertex_activated;
    return *this;
@@ -882,6 +882,8 @@ void GlueXPrimaryGeneratorAction::GeneratePrimariesHDDM(G4Event* anEvent)
          }
          z = fTargetCenterZ + (G4UniformRand() - 0.5) * fTargetLength;
       }
+      assert (fPrimaryGenerator != 0);
+      assert (fPhotonBeamGenerator != 0);
       double ttag = fPhotonBeamGenerator->GenerateTriggerTime(anEvent);
       double trel = (z - fRFreferencePlaneZ) / beamVelocity;
       fPrimaryGenerator->SetParticlePosition(G4ThreeVector(x,y,z));