Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop

This commit is contained in:
Sebastian Wehling-Benatelli 2016-08-09 13:10:49 +02:00
commit 94782f6758

View File

@ -388,24 +388,16 @@ class PDFstatistics(object):
def getQD(self,value): def getQD(self,value):
QDlist = [] QDlist = []
for pdf in self: for pdf in self:
try: QD = pdf.quantile_distance(value)
QD = pdf.quantile_distance(value) QDlist.append(QD)
QDlist.append(QD)
except AttributeError as e:
if e.message == "'float' object has no attribute 'quantile_distance'":
continue
return QDlist return QDlist
def getQDQ(self,value): def getQDQ(self,value):
QDQlist = [] QDQlist = []
for pdf in self: for pdf in self:
try: QDQ = pdf.qtile_dist_quot(value)
QDQ = pdf.qtile_dist_quot(value) QDQlist.append(QDQ)
QDQlist.append(QDQ)
except AttributeError as e:
if e.message == "'float' object has no attribute 'quantile_distance'":
continue
return QDQlist return QDQlist
@ -419,6 +411,7 @@ class PDFstatistics(object):
std = np.array(std) std = np.array(std)
self.set_stdarray(std) self.set_stdarray(std)
def set_stdarray(self, array): def set_stdarray(self, array):
if self.return_phase == 'P': if self.return_phase == 'P':
self.p_stdarray = array self.p_stdarray = array
@ -477,7 +470,6 @@ def main():
Insheim.getSTD() Insheim.getSTD()
qdlist = Insheim.getQDQ(0.3) qdlist = Insheim.getQDQ(0.3)
binlist = Insheim.getBinList(0.,3.) binlist = Insheim.getBinList(0.,3.)
Insheim.histplot(qdlist,binlist)
print qdlist print qdlist