starting to change methotds of LIGO to functions in ifo

playground/andreas/testLIGO/testLIGO.py

@@ -42,7 +42,7 @@ def main():
     kat.ITMX.mass = 1e9
     kat.ITMY.mass = 1e9
     kat.verbose = False
-    kat.maxtem = 4# "off"
+    kat.maxtem =  "off"
     kat.phase = 2
 
     #----------------------------------------------------------
@@ -115,7 +115,7 @@ def main():
     import datetime
     strtoday = datetime.datetime.now()
     pre_code1 = "# Pretuned with ifo.py (PyKat) on"+ strtoday.strftime("%d.%m.%Y %H:%M:%S")+"\n"
-    tunings = LIGO1.get_tunings(kat)
+    tunings = ifo.get_tunings(kat, LIGO1.tunings)
     _maxtemStr = "{}".format(tunings["maxtem"])
     if tunings["maxtem"] == -1:
         _maxtemStr="off"
@@ -141,10 +141,10 @@ def pretune(kat, verbose=False, debug=False):
     kat_pretune = kat.deepcopy()
     ifo.remove_components(kat_pretune, ["mod1", "lmod2", "mod2", "lmod3"], component_in="lmod1");
     LIGO1.pretune(kat_pretune, verbose=verbose, pretune_precision=1.0e-4)
-    pretuning = LIGO1.get_tunings(kat_pretune)
+    pretuning = ifo.get_tunings(kat_pretune, LIGO1.tunings)
     if debug:
         LIGO1.plot_pretuning_powers(kat_pretune, xlimits=[-.1, .1])
-    LIGO1.set_tunings(kat, pretuning)
+    ifo.set_tunings(kat, pretuning)
 
     # adjusting length of PRC and SRC versus mod frequencies
     LIGO1.adjust_PRC_length(kat, verbose=verbose)