change to the plotting script

plotting/GAL_PLOT.py

@@ -41,40 +41,23 @@ def conf_hmz(schains, directory, injection=None, data=None, priorChains=None, mo
     h = []
     nm = []
     nz = []
-    nsum = []
-    phig = []
-    mbh = []
-    nmerger = [] 
-    '''
+    
     for k in params:
-        initpar = dict(Phi0 = schains[k,0], PhiI = schains[k,1], M0 = schains[k,2], alpha = schains[k,3], alphaI = schains[k,4], f0 = schains[k,5], beta = schains[k,7], gamma = schains[k,6], delta = schains[k,8], t0 = schains[k,9], epsilon = schains[k,10], zeta = schains[k,11], eta = schains[k,12], Ms = schains[k,13], theta = schains[k,14], sigma = schains[k,15], e0 = schains[k,16], rho = schains[k,17])
+        initpar = dict(Phi0 = schains[k,0], PhiI = schains[k,1], M0 = schains[k,2], alpha = schains[k,3], alphaI = schains[k,4], f0 = schains[k,5], beta = schains[k,6], gamma = schains[k,7], delta = schains[k,8], t0 = schains[k,9], epsilon = schains[k,10], zeta = schains[k,11], eta = schains[k,12], Ms = schains[k,13], theta = schains[k,14], sigma = schains[k,15], e0 = schains[k,16], rho = schains[k,17])
         mrate = mr.mergerrate(M1,q,z,f,**initpar)
         merger = mrate.hmodelt(fbin=None)
         out = numpy.sum(merger[1],axis=1)
-        #out = numpy.multiply(out,2.*qdiff)
         outm = numpy.multiply(out,2.*mrate.zpdiff*mcdiff)
         outm = numpy.sum(outm,axis=1)
         outz = numpy.sum(out,axis=0)
         h.append(merger[0])
         nm.append(outm)
         nz.append(outz)
-        nsum.append(numpy.multiply(merger[1],0.55))
-        #nsum.append(1.1*numpy.sum(outm))
-        outphi = mrate.output(function='Phi')
-        phig.append(outphi)
-        mbh.append(mrate.MBH1)
-        #nmerger.append(mrate.grid(function=number'))
 
     numpy.savetxt('{0}/h_lines.dat'.format(directory),h,fmt="%f")
     numpy.savetxt('{0}/m_lines.dat'.format(directory),nm,fmt="%e")
     numpy.savetxt('{0}/z_lines.dat'.format(directory),nz,fmt="%e")
-    #numpy.savetxt('{0}/nsum.dat'.format(directory),nsum,fmt="%e")
-    numpy.save('{0}/nsum.npy'.format(directory),nsum)
-    numpy.save('{0}/phi_g.npy'.format(directory),phig)
-    numpy.save('{0}/mbh.npy'.format(directory),mbh)
-    #numpy.save('{0}/number.npy'.format(directory),nmerger)
     
-
     h = numpy.genfromtxt('{0}/h_lines.dat'.format(directory))
     nm = numpy.genfromtxt('{0}/m_lines.dat'.format(directory))
     nz = numpy.genfromtxt('{0}/z_lines.dat'.format(directory))
@@ -96,7 +79,7 @@ def conf_hmz(schains, directory, injection=None, data=None, priorChains=None, mo
     #numpy.savetxt("{0}/nm.dat".format(directory),sm,fmt='%e')
     #sz = numpy.vstack((z,zdown1,zdown5,zdown32,zup68,zup95,zup99,zmed)).T
     #numpy.savetxt("{0}/nz.dat".format(directory),sz,fmt='%f')
-    '''
+    
 
     # prior plotting
     if priorChains is not None:
@@ -107,29 +90,21 @@ def conf_hmz(schains, directory, injection=None, data=None, priorChains=None, mo
         hPrior = []
         nmPrior = []
         nzPrior = []
-        #phig_prior = []
-        #mbh_prior = []
         for k in priorParams:
-            initpar = dict(Phi0 = priorChains[k,0], PhiI = priorChains[k,1], M0 = priorChains[k,2], alpha = priorChains[k,3], alphaI = priorChains[k,4], f0 = priorChains[k,5], beta = priorChains[k,7], gamma = priorChains[k,6], delta = priorChains[k,8], t0 = priorChains[k,9], epsilon = priorChains[k,10], zeta = priorChains[k,11], eta = priorChains[k,12], Ms = priorChains[k,13], theta = priorChains[k,14], sigma = priorChains[k,15], e0 = priorChains[k,16], rho = priorChains[k,17])
+            initpar = dict(Phi0 = priorChains[k,0], PhiI = priorChains[k,1], M0 = priorChains[k,2], alpha = priorChains[k,3], alphaI = priorChains[k,4], f0 = priorChains[k,5], beta = priorChains[k,6], gamma = priorChains[k,7], delta = priorChains[k,8], t0 = priorChains[k,9], epsilon = priorChains[k,10], zeta = priorChains[k,11], eta = priorChains[k,12], Ms = priorChains[k,13], theta = priorChains[k,14], sigma = priorChains[k,15], e0 = priorChains[k,16], rho = priorChains[k,17])
             mrate = mr.mergerrate(M1,q,z,f,**initpar)
             merger = mrate.hmodelt(fbin=None)
             out = numpy.sum(merger[1],axis=1)
-            outm = numpy.multiply(out,mrate.zpdiff/mcdiff)
+            outm = numpy.multiply(out,2.*mrate.zpdiff*mcdiff)
             outm = numpy.sum(outm,axis=1)
             outz = numpy.sum(out,axis=0)
             hPrior.append(merger[0])
             nmPrior.append(outm)
             nzPrior.append(outz)
-            #outphi = mrate.output(function='Phi')
-            #phig_prior.append(outphi)
-            #mbh_prior.append(mrate.MBH1)
 
         numpy.savetxt('{0}/h_linesprior.dat'.format(directory),hPrior,fmt="%f")
         numpy.savetxt('{0}/m_linesprior.dat'.format(directory),nmPrior,fmt="%e")
         numpy.savetxt('{0}/z_linesprior.dat'.format(directory),nzPrior,fmt="%e")
-        #numpy.save('{0}/phi_g_prior.npy'.format(directory),phig_prior)
-        #numpy.save('{0}/mbh_prior.npy'.format(directory),mbh_prior)
-        
 
         hPrior = numpy.genfromtxt('{0}/h_linesprior.dat'.format(directory))
         nmPrior = numpy.genfromtxt('{0}/m_linesprior.dat'.format(directory))