Skip to content

Commit bad7548

Browse files
committed
ore mods for lacunarity analysis
1 parent fc10d16 commit bad7548

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

ratiofits.py

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,32 @@
2525
tohoku_prams = {'mc':5.0, 'todt':mhp.dtm.datetime.now(mhp.pytz.timezone('UTC')), 'winlen':None, 'avlen':None, 'targmag':9.0, 'ndithers':10, 'nContours':nContours1, 'bigmag':7.0, 'lons':[135., 148.5], 'lats':[30., 45.25], 'refreshcat':True, 'dt0':mhp.dtm.datetime(1990,1,1, tzinfo=mhp.pytz.timezone('UTC')), 'catname':'cats/tohoku_rfits.cat', 'mt':7.6}
2626

2727
def doTohoku():
28-
A = get_rbratios_tohoku()
28+
A = get_rbratios_tohoku() # returns a rbratios() set like [[index, dtm, r>, r<, ratio, <ratio>]]
2929
B = get_ratio_fits(ratios=A, Nfits=[22])
3030
C = plot_ratio_fits(B, new_figs=False, fignum0=2)
3131
#
3232
return (A,B,C)
3333

34+
def doSumatra():
35+
# get a bunch of sumatra fits from rbTectoFigs. we'll want analysis on 0, 2, 3
36+
sumatra_catalog = rfp.sumatraQuad()
37+
#
38+
interesting_quads = [0,2,3]
39+
40+
#
41+
mev = sumatra_catalog.getMainEvent(thiscat=sumatra_catalog.getcat(0))
42+
interval_len = rfp.winlen(m=9.1, mc=sumatra_catalog.mc, mt=7.6, doInt=True)
43+
#rbratios = sumatra_catalog.getNRBratios(intervals=None, winlen=1, delta_t=1, reverse=False, catnum=0)
44+
rbratios = sumatra_catalog.plotIntervalRatiosAx(winlen=interval_len, cat=sumatra_catalog.getcat(1), hitThreshold=1.0, bigmag=9.0, thisAx=None, ratios=None, delta_t=1, avlen=max(1, int(interval_len/10)), mainEv=mev, logZ=None, rbLegLoc=0, reverse=False)
45+
46+
rbratio_fits = get_ratio_fits(ratios=rbratios, Nfits=[rfp.winlen(m=9.1, mc=sumatra_catalog.mc, mt=7.6, doInt=True)])
47+
48+
rbf_plot=None
49+
#rbf_plot = plot_ratio_fits(rbratio_fits, new_figs=False, fignum0=11)
50+
#
51+
return (rbratios, rbratio_fits, rbf_plot)
52+
#
53+
#
3454
def get_rbratios_tohoku(mc=5.0, todt=mhp.dtm.datetime.now(mhp.pytz.timezone('UTC')), winlen=None, avlen=None, targmag=9.0, ndithers=10, nContours=nContours1, bigmag=7.0, lons=[135., 148.5], lats=[30., 45.25], refreshcat=True, dt0=mhp.dtm.datetime(1990,1,1, tzinfo=mhp.pytz.timezone('UTC')), catname='cats/tohoku_rfits.cat', mt=7.6):
3555
#
3656
# fetch and return a standard rb-ratio set.

rbTectoFigs.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,7 @@ def sumatraQuad(mc=5.0, targmag=9.1, rbavelen=None, bigmag=9.5, intlist=None, ca
931931
#
932932
c1=eqp.eqcatalog([])
933933
c1.mt=mt
934+
c1.mc=mc
934935
c1.loadCatFromFile(catname)
935936
c1.cat.sort(key = lambda x:x[0])
936937
dlambda=1.76

0 commit comments

Comments
 (0)