Skip to content
Snippets Groups Projects
Commit daba1bc7 authored by Alessandro Mirone's avatar Alessandro Mirone
Browse files

corrected two small things

parent 0868e99f
No related branches found
No related tags found
No related merge requests found
......@@ -574,14 +574,14 @@ if(sys.argv[0][-12:]!="sphinx-build"):
totalstats = 1.0
if "branchWeight" in dir():
if "branchWeight" in dir() and branchWeight is not None:
if count==0 : print " CONSIDERING WEIGTHED BRANCHES AS GIVEN BY branchWeight = ", branchWeight
totalstats= totalstats *numpy.array(branchWeight)
else:
if count==0 :print "no branchWeight provided, considering all branches \n"*10
if "energyWindow" in dir():
if "energyWindow" in dir() and energyWindow is not None:
if count==0 :print " CONSIDERING energyWindow(meV) = ", energyWindow
totalstats= totalstats *numpy.less(evals * 12398.5253/(10.0**8) *1000.0 , energyWindow[1])
totalstats= totalstats *numpy.less(energyWindow[0] ,evals * 12398.5253/(10.0**8) *1000.0)
......
......@@ -166,9 +166,6 @@ lowerLimit=0.000001
bottom_meV = 0
""" Calculated eigenvalues are clipped to this value before use.
"""
branchWeight=None
""" a list of weights : one per branch.
"""
Eigscal=0
"""
EigScal==1 Intensity are calculated WITH only eigenvector scalar products ; ==2 Intensity are calculated WITH only eigenvector scalar products PLUS Mass factor
......@@ -524,14 +521,14 @@ if(sys.argv[0][-12:]!="sphinx-build"):
if EigScal:
totalstats = 1.0
if "branchWeight" in dir():
if "branchWeight" in dir() and branchWeight is not None:
if count==0 : print " CONSIDERING WEIGTHED BRANCHES AS GIVEN BY branchWeight = ", branchWeight
totalstats= totalstats *numpy.array(branchWeight)
else:
if count==0 :print "no branchWeight provided, considering all branches \n"*10
if "energyWindow" in dir():
if "energyWindow" in dir() and energyWindow is not None :
if count==0 :print " CONSIDERING energyWindow(meV) = ", energyWindow
totalstats= totalstats *numpy.less(evals * 12398.5253/(10.0**8) *1000.0 , energyWindow[1])
totalstats= totalstats *numpy.less(energyWindow[0] ,evals * 12398.5253/(10.0**8) *1000.0)
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment