diff --git a/gwinc/precomp.py b/gwinc/precomp.py index d89b2a0adec904ca3b5cd492ea6667b28dfd2303..d9a616ef5b16465555e8e2ef6ef56e95b2b0fd3f 100644 --- a/gwinc/precomp.py +++ b/gwinc/precomp.py @@ -120,7 +120,7 @@ def precompIFO(f, ifoin, PRfixed=True): # Suspension # if the suspension code supports different temps for the stages fname = eval('suspension.susp{}'.format(ifo.Suspension.Type)) - hForce, vForce, hTable, vTable = fname(f, ifo) + hForce, vForce, hTable, vTable = fname(f, ifo.Suspension) try: # full TF (conventional) diff --git a/gwinc/suspension.py b/gwinc/suspension.py index de11ccdbc2b792235edfd85ffc3f9be8e1c62536..b94ff026a1b702802e4d8e60fed4e74078618f0f 100644 --- a/gwinc/suspension.py +++ b/gwinc/suspension.py @@ -67,14 +67,14 @@ def top_displ_to_tst_displ(k, m, f): return X0 * k0 -def suspQuad(f, ifo, material='Silica'): +def suspQuad(f, sus, material='Silica'): """Suspension for quadruple pendulum - `f` is frequency vector, `ifo` is IFO model. `material` specifies - material used for test mass suspension stage. steel used for all - other stages. Violin modes are included. + `f` is frequency vector, `sus` is suspension model. `material` + specifies material used for test mass suspension stage. steel + used for all other stages. Violin modes are included. - ifo.Suspension.FiberType should be: 0=round, 1=ribbons. + sus.FiberType should be: 0=round, 1=ribbons. hForce, vForce = transfer functions from the force on the TM to TM motion these should have the correct losses for the mechanical @@ -84,7 +84,7 @@ def suspQuad(f, ifo, material='Silica'): = hForce + theta^2 * vForce = admittance / (i * w) - where theta = ifo.Suspension.VHCoupling.theta. + where theta = sus.VHCoupling.theta. Since this is just suspension thermal noise, the TM internal modes and coating properties should not be included. @@ -101,8 +101,6 @@ def suspQuad(f, ifo, material='Silica'): """ g = const.g - sus = ifo.Suspension - # bottom stage fiber Type FiberType = sus.FiberType assert FiberType in FIBER_TYPES @@ -417,10 +415,10 @@ def suspQuad(f, ifo, material='Silica'): return hForce, vForce, hTable, vTable -def suspBQuad(f, ifo): +def suspBQuad(f, sus): """Wrapper of suspQuad to use Silicon for final stage - FIXME: material should be specified in ifo.Suspension.Stage + FIXME: material should be specified in sus.Stage """ - return suspQuad(f, ifo, material='Silicon') + return suspQuad(f, sus, material='Silicon')