update contamination analysis stuff

- fix Constraint.renormalize_no_fix() which could enter an infinite loop if the
  fixed parameter was greater than 1 - EPSILON
- don't divide by psi twice in get_events()
- only use prompt events and cut on nhit_cal < 100

1 files changed, 4 insertions, 2 deletions

diff --git a/utils/dc b/utils/dc
index 834c6e5..8227e99 100755
--- a/utils/dc
+++ b/utils/dc
@@ -280,6 +280,8 @@ if __name__ == '__main__':
     import matplotlib.pyplot as plt
 
     ev = get_events(args.filenames,merge_fits=True)
+    ev = ev[ev.prompt]
+    ev = ev[ev.nhit_cal > 100]
 
     # figure out bins for high level variables
     ev = radius_cut(ev)
@@ -451,7 +453,7 @@ if __name__ == '__main__':
     #samples = metropolis_hastings(nll,xopt,stepsizes,100000)
     #print("nll(xopt) = %.2g" % nll(xopt))
 
-    pos = np.empty((10, len(x0)),dtype=np.double)
+    pos = np.empty((100, len(x0)),dtype=np.double)
     for i in range(pos.shape[0]):
         pos[i] = xopt + np.random.randn(len(x0))*stepsizes
         pos[i,:6] = np.clip(pos[i,:6],EPSILON,1e9)
@@ -463,7 +465,7 @@ if __name__ == '__main__':
 
     nwalkers, ndim = pos.shape
 
-    proposal = get_proposal_func(stepsizes*0.1,low,high)
+    proposal = get_proposal_func(stepsizes,low,high)
     sampler = emcee.EnsembleSampler(nwalkers, ndim, lambda x, grad, fill_value: -nll(x,grad,fill_value), moves=emcee.moves.MHMove(proposal),args=[None,np.inf])
     with np.errstate(invalid='ignore'):
         sampler.run_mcmc(pos, args.steps)