Skip to content
Snippets Groups Projects
Commit 2d0ac669 authored by Jameson Graef Rollins's avatar Jameson Graef Rollins Committed by Jameson Rollins
Browse files

Remove NFolded support

This is a specialized configuration that is not currently supported.  Needed
functions were not ported from matgwinc, so this never actually worked.
parent d731495a
No related branches found
No related tags found
1 merge request!49gwinc convenience function use new budget interface
......@@ -42,43 +42,6 @@ def noise_calc(f, ifo):
if 'Atmospheric' in ifo:
noises['Atmospheric Infrasound'] = noise.newtonian.atmois(f, ifo)
# adjust noise curves for multiple bounces - for resonant delay lines
# Brownian noise scales as Neff (correlation-corrected spot number)
# Displacement noises scale as N^2
# Thermo-optic noise scales as N (incoherent between spots)
if 'NFolded' in ifo.Infrastructure:
logging.info('FOLDED')
if ifo.Infrastructure.travellingWave:
N = ifo.Infrastructure.NFolded
sep_w = ifo.Infrastructure.DelayLineSpotSeparation
Neff = getBrownianCorrelationFactor(N,sep_w) # not yet ported to python
noises['Suspension Thermal'] *= N**2
noises['Substrate Brownian'] *= Neff
noises['Coating Brownian'] *= Neff
noises['Substrate Thermo-Elastic'] *= N**2
noises['Newtonian Gravity'] *= N**2
noises['Seismic'] *= N**2
noises['Coating Thermo-Optic'] *= N
if 'Atmospheric Infrasound' in noises:
noises['Atmospheric Infrasound'] *= N**2
else:
N = ifo.Infrastructure.NFolded
sep_w = ifo.Infrastructure.DelayLineSpotSeparation
Neff = getBrownianCorrelationFactorStandingWave(N,sep_w) # not yet ported to python
Ndispl = (2*N-1)
N_TO = 4*N-3 # use naive counting, needs improvement
noises['Suspension Thermal'] *= Ndispl**2
noises['Substrate Brownian'] *= Neff
noises['Coating Brownian'] *= Neff
noises['Substrate Thermo-Elastic'] *= Ndispl**2
noises['Newtonian Gravity'] *= Ndispl**2
noises['Seismic'] *= Ndispl**2
noises['Coating Thermo-Optic'] *= N_TO
if 'Atmospheric Infrasound' in noises:
noises['Atmospheric Infrasound'] *= Ndispl**2
#noises['Mirror Thermal'] = noises['Substrate Brownian'] + noises['Coating Brownian'] + \
# noises['Substrate Thermo-Elastic'] + noises['Coating Thermo-Optic'] # total mirror thermal
noises['Total'] = sum(noises[curve] for curve in noises)
noises['Freq'] = f
......
......@@ -24,16 +24,6 @@ def shotrad(f, ifo):
# from .quantum_2mode import shotrad as shotrad_2mode
# return shotrad_2mode(f, ifo)
# deal with multiple bounces, required for resonant delay lines
# Stefan Ballmer 2012
if 'NFolded' in ifo.Infrastructure:
if ifo.Infrastructure.travellingWave:
ifo.Materials.MirrorMass=ifo.Materials.MirrorMass/ifo.Infrastructure.NFolded**2
else:
NN=ifo.Infrastructure.NFolded
Ndispl=2 * NN-1
ifo.Materials.MirrorMass=ifo.Materials.MirrorMass/Ndispl**2
#####################################################
# Call IFO Quantum Model
#####################################################
......
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