Merge pull request #40 from JeffersonLab/repair_broken_makefile_rtj

Repair broken makefile rtj
JeffersonLab · Nov 25, 2017 · 20b3b13 · 20b3b13
2 parents a9bfd4b + 9902b30
commit 20b3b13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -87,6 +87,8 @@ INTYLIBS += -L$(G4TMPDIR) -lhdds
 INTYLIBS += -lboost_python -L$(shell python-config --prefix)/lib $(shell python-config --ldflags)
 INTYLIBS += -L$(G4ROOT)/lib64 $(patsubst $(G4ROOT)/lib64/lib%.so, -l%, $(G4shared_libs))
 
+EXTRALIBS += -lG4fixes
+
 .PHONY: all
 all: hdds cobrems g4fixes sharedlib exe lib bin g4py
 
@@ -113,7 +115,7 @@ sharedlib: $(G4TMPDIR)/libhdgeant4.so
 $(G4TMPDIR)/libhdgeant4.so: $(hdgeant4_objects)
 
 $(G4TMPDIR)/libG4fixes.so: $(G4FIXESDIR)/G4fixes.o $(G4fixes_objects) $(G4debug_objects)
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -Wl,--export-dynamic -Wl,-soname,libcobrems.so \
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -Wl,--export-dynamic -Wl,-soname,libG4fixes.so \
 	-shared -o $@ $^ $(G4shared_libs) -lboost_python
 
 $(G4FIXESDIR)/G4fixes.o: src/G4fixes.cc

diff --git a/src/GlueXPrimaryGeneratorAction.cc b/src/GlueXPrimaryGeneratorAction.cc
@@ -367,8 +367,8 @@ void GlueXPrimaryGeneratorAction::GeneratePrimariesParticleGun(G4Event* anEvent)
    }
    if (fGunParticle.deltaTheta > 0) {
       if (fGunParticle.plogOption) {
-         double thetamin = thetap - fGunParticle.deltaMom / 2;
-         double thetamax = thetap + fGunParticle.deltaMom / 2;
+         double thetamin = thetap - fGunParticle.deltaTheta / 2;
+         double thetamax = thetap + fGunParticle.deltaTheta / 2;
          thetamin = (thetamin > 0)? thetamin : 1e-6*degree;
          thetap = thetamin * pow(thetamax/thetamin, G4UniformRand());
       }