add suspension thermal sub-budgets to all of the canonical IFOs

gwinc/ifo/CE1/__init__.py

@@ -41,29 +41,6 @@ class Newtonian(nb.Budget):
     ]
 
 
-class SuspensionThermal(nb.Budget):
-    """Suspension Thermal
-
-    """
-
-    name = 'SuspensionThermal'
-
-    style = dict(
-        label='Suspension Thermal',
-        color='#0d75f8',
-    )
-
-    noises = [
-        SuspensionThermalHorizTop,
-        SuspensionThermalHorizAPM,
-        SuspensionThermalHorizPUM,
-        SuspensionThermalHorizTM,
-        SuspensionThermalVertTop,
-        SuspensionThermalVertAPM,
-        SuspensionThermalVertPUM,
-    ]
-
-
 class Coating(nb.Budget):
     """Coating Thermal
 

gwinc/ifo/CE2/__init__.py

@@ -41,29 +41,6 @@ class Newtonian(nb.Budget):
     ]
 
 
-class SuspensionThermal(nb.Budget):
-    """Suspension Thermal
-
-    """
-
-    name = 'SuspensionThermal'
-
-    style = dict(
-        label='Suspension Thermal',
-        color='#0d75f8',
-    )
-
-    noises = [
-        SuspensionThermalHorizTop,
-        SuspensionThermalHorizAPM,
-        SuspensionThermalHorizPUM,
-        SuspensionThermalHorizTM,
-        SuspensionThermalVertTop,
-        SuspensionThermalVertAPM,
-        SuspensionThermalVertPUM,
-    ]
-
-
 class Coating(nb.Budget):
     """Coating Thermal
 

gwinc/ifo/noises.py

@@ -344,9 +344,6 @@ class StandardQuantumLimit(nb.Noise):
         ETM = mirror_struct(self.ifo, 'ETM')
         return 8 * const.hbar / (ETM.MirrorMass * (2 * np.pi * self.freq) ** 2)
 
-#########################
-# seismic
-#########################
 
 #########################
 # seismic
@@ -464,22 +461,6 @@ class NewtonianInfrasound(nb.Noise):
 # suspension thermal
 #########################
 
-class SuspensionThermal(nb.Noise):
-    """Suspension Thermal
-
-    """
-    style = dict(
-        label='Suspension Thermal',
-        color='#0d75f8',
-    )
-
-    @nb.precomp(sustf=precomp_suspension)
-    def calc(self, sustf):
-        n = noise.suspensionthermal.suspension_thermal(
-            self.freq, self.ifo.Suspension, sustf)
-        return n * 4
-
-
 class SuspensionThermalHorizTop(nb.Noise):
     """Horizontal suspension thermal around the top mass
 
@@ -621,6 +602,29 @@ class SuspensionThermalVertTM(nb.Noise):
         return abs(n) * 4
 
 
+class SuspensionThermal(nb.Budget):
+    """Suspension Thermal
+
+    """
+
+    name = 'SuspensionThermal'
+
+    style = dict(
+        label='Suspension Thermal',
+        color='#0d75f8',
+    )
+
+    noises = [
+        SuspensionThermalHorizTop,
+        SuspensionThermalHorizAPM,
+        SuspensionThermalHorizPUM,
+        SuspensionThermalHorizTM,
+        SuspensionThermalVertTop,
+        SuspensionThermalVertAPM,
+        SuspensionThermalVertPUM,
+    ]
+
+
 #########################
 # coating thermal
 #########################