update sub-budgets to use new precomp

gwinc/ifo/noises.py

@@ -138,6 +138,12 @@ def precomp_cavity(f, ifo):
     ifo.gwinc.wBeam_ITM = wBeam_ITM
     ifo.gwinc.wBeam_ETM = wBeam_ETM
 
+
+def precomp_quantum(f, ifo):
+    noise_dict = noise.quantum.shotrad(f, ifo)
+    ifo.gwinc.quantum = noise_dict
+
+
 ##################################################
 
 ############################################################
@@ -199,8 +205,6 @@ class QuantumVacuum(nb.Noise):
     ]
 
     def calc(self):
-        precomp_mirror(self.freq, self.ifo)
-        precomp_gwinc(self.freq, self.ifo)
         noise_dict = noise.quantum.shotrad(self.freq, self.ifo)
         total = np.zeros_like(noise_dict['arm'])
         for nn in noise_dict.values():
@@ -217,11 +221,14 @@ class QuantumVacuumAS(nb.Noise):
         color='xkcd:emerald green'
     )
 
+    precomp = [
+        precomp_mirror,
+        precomp_power,
+        precomp_quantum
+    ]
+
     def calc(self):
-        precomp_mirror(self.freq, self.ifo)
-        precomp_gwinc(self.freq, self.ifo)
-        noise_dict = noise.quantum.shotrad(self.freq, self.ifo)
-        return noise_dict['asvac']
+        return self.ifo.gwinc.quantum['asvac']
 
 
 class QuantumVacuumArm(nb.Noise):
@@ -233,11 +240,14 @@ class QuantumVacuumArm(nb.Noise):
         color='xkcd:orange brown'
     )
 
+    precomp = [
+        precomp_mirror,
+        precomp_power,
+        precomp_quantum
+    ]
+
     def calc(self):
-        precomp_mirror(self.freq, self.ifo)
-        precomp_gwinc(self.freq, self.ifo)
-        noise_dict = noise.quantum.shotrad(self.freq, self.ifo)
-        return noise_dict['arm']
+        return self.ifo.gwinc.quantum['arm']
 
 
 class QuantumVacuumSRC(nb.Noise):
@@ -249,11 +259,15 @@ class QuantumVacuumSRC(nb.Noise):
         color='xkcd:cerulean'
     )
 
+    precomp = [
+        precomp_mirror,
+        precomp_power,
+        precomp_quantum
+    ]
+
     def calc(self):
-        precomp_mirror(self.freq, self.ifo)
-        precomp_gwinc(self.freq, self.ifo)
         noise_dict = noise.quantum.shotrad(self.freq, self.ifo)
-        return noise_dict['src']
+        return self.ifo.gwinc.quantum['src']
 
 
 class QuantumVacuumFilterCavity(nb.Noise):
@@ -265,11 +279,15 @@ class QuantumVacuumFilterCavity(nb.Noise):
         color='xkcd:goldenrod'
     )
 
+    precomp = [
+        precomp_mirror,
+        precomp_power,
+        precomp_quantum
+    ]
+
     def calc(self):
-        precomp_mirror(self.freq, self.ifo)
-        precomp_gwinc(self.freq, self.ifo)
-        noise_dict = noise.quantum.shotrad(self.freq, self.ifo)
-        # FC0 are the noises from the filter cavity losses and F0_unsqzd_back
+        noise_dict = self.ifo.gwinc.quantum
+        # FC0 are the noises from the filter cavity losses and FC0_unsqzd_back
         # are noises from the unsqueezed vacuum injected at the back mirror
         # Right now there are at most one filter cavity in all the models;
         # if there were two, there would also be FC1 and FC1_unsqzd_back, etc.
@@ -286,11 +304,14 @@ class QuantumVacuumInjection(nb.Noise):
         color='xkcd:fuchsia'
     )
 
+    precomp = [
+        precomp_mirror,
+        precomp_power,
+        precomp_quantum
+    ]
+
     def calc(self):
-        precomp_mirror(self.freq, self.ifo)
-        precomp_gwinc(self.freq, self.ifo)
-        noise_dict = noise.quantum.shotrad(self.freq, self.ifo)
-        return noise_dict['injection']
+        return self.ifo.gwinc.quantum['injection']
 
 
 class QuantumVacuumReadout(nb.Noise):
@@ -302,11 +323,14 @@ class QuantumVacuumReadout(nb.Noise):
         color='xkcd:mahogany'
     )
 
+    precomp = [
+        precomp_mirror,
+        precomp_power,
+        precomp_quantum
+    ]
+
     def calc(self):
-        precomp_mirror(self.freq, self.ifo)
-        precomp_gwinc(self.freq, self.ifo)
-        noise_dict = noise.quantum.shotrad(self.freq, self.ifo)
-        return noise_dict['pd']
+        return self.ifo.gwinc.quantum['pd']
 
 
 class StandardQuantumLimit(nb.Noise):