coating noise simplification

new coating_brownian() and coating_thermooptic() functions for
calculating coating thermal noise spectrum for a single optic.

ifo CoatingBrownian and CoatingThermoOptic Noise classes modified to
handle specific case of Fabry-Perot Michelson.

gwinc/ifo/noises.py

@@ -114,7 +114,17 @@ class CoatingBrownian(nb.Noise):
     )
 
     def calc(self):
-        return noise.coatingthermal.coatbrownian(self.freq, self.ifo)
+        wavelength = self.ifo.Laser.Wavelength
+        materials = self.ifo.Materials
+        wBeam_ITM = self.ifo.Optics.ITM.BeamRadius
+        wBeam_ETM = self.ifo.Optics.ETM.BeamRadius
+        dOpt_ITM = self.ifo.Optics.ITM.CoatLayerOpticalThickness
+        dOpt_ETM = self.ifo.Optics.ETM.CoatLayerOpticalThickness
+        nITM = noise.coatingthermal.coating_brownian(
+            self.freq, materials, wavelength, wBeam_ITM, dOpt_ITM)
+        nETM = noise.coatingthermal.coating_brownian(
+            self.freq, materials, wavelength, wBeam_ETM, dOpt_ETM)
+        return (nITM + nETM) * 2 * self.ifo.gwinc.dhdl_sqr
 
 
 class CoatingThermoOptic(nb.Noise):
@@ -128,7 +138,17 @@ class CoatingThermoOptic(nb.Noise):
     )
 
     def calc(self):
-        return noise.coatingthermal.thermooptic(self.freq, self.ifo)
+        wavelength = self.ifo.Laser.Wavelength
+        materials = self.ifo.Materials
+        wBeam_ITM = self.ifo.Optics.ITM.BeamRadius
+        wBeam_ETM = self.ifo.Optics.ETM.BeamRadius
+        dOpt_ITM = self.ifo.Optics.ITM.CoatLayerOpticalThickness
+        dOpt_ETM = self.ifo.Optics.ETM.CoatLayerOpticalThickness
+        nITM, junk1, junk2, junk3 = noise.coatingthermal.coating_thermooptic(
+            self.freq, materials, wavelength, wBeam_ITM, dOpt_ITM[:])
+        nETM, junk1, junk2, junk3 = noise.coatingthermal.coating_thermooptic(
+            self.freq, materials, wavelength, wBeam_ETM, dOpt_ETM[:])
+        return (nITM + nETM) * 2 * self.ifo.gwinc.dhdl_sqr
 
 
 class ITMThermoRefractive(nb.Noise):

gwinc/precomp.py

@@ -56,11 +56,11 @@ def precompIFO(f, ifoin, PRfixed=True):
         T = ifo.Optics.ITM.Transmittance
         dL = ifo.Optics.ITM.CoatingThicknessLown
         dCap = ifo.Optics.ITM.CoatingThicknessCap
-        ifo.Optics.ITM.CoatLayerOpticalThickness = getCoatDopt(ifo, T, dL, dCap=dCap)
+        ifo.Optics.ITM.CoatLayerOpticalThickness = getCoatDopt(ifo.Materials, T, dL, dCap=dCap)
         T = ifo.Optics.ETM.Transmittance
         dL = ifo.Optics.ETM.CoatingThicknessLown
         dCap = ifo.Optics.ETM.CoatingThicknessCap
-        ifo.Optics.ETM.CoatLayerOpticalThickness = getCoatDopt(ifo, T, dL, dCap=dCap)
+        ifo.Optics.ETM.CoatLayerOpticalThickness = getCoatDopt(ifo.Materials, T, dL, dCap=dCap)
 
     ##############################
     # beam parameters