From c93e0e13b6029dcc35a33057341dedb10bba685b Mon Sep 17 00:00:00 2001
From: Joris van Zwieten <zwieten@astron.nl>
Date: Wed, 9 Sep 2009 09:56:51 +0000
Subject: [PATCH] Bug 1283: Fixed imports in solflag.py and renamed module to
lofar.solutions
---
CEP/Calibration/BBSControl/scripts/Makefile.am | 2 +-
CEP/Calibration/BBSControl/scripts/example_solflag.py | 4 ++--
CEP/Calibration/BBSControl/scripts/example_solplot.py | 6 +++---
CEP/Calibration/BBSControl/scripts/solflag.py | 4 +++-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/CEP/Calibration/BBSControl/scripts/Makefile.am b/CEP/Calibration/BBSControl/scripts/Makefile.am
index b358f40df96..7d1fa365c53 100644
--- a/CEP/Calibration/BBSControl/scripts/Makefile.am
+++ b/CEP/Calibration/BBSControl/scripts/Makefile.am
@@ -1,5 +1,5 @@
lofarpython_PYTHON = __init__.py solfetch.py solplot.py solflag.py
-lofarpythondir = $(pythondir)/lofar/sol
+lofarpythondir = $(pythondir)/lofar/solutions
libdir = $(lofarpythondir)
include $(top_srcdir)/Makefile.common
diff --git a/CEP/Calibration/BBSControl/scripts/example_solflag.py b/CEP/Calibration/BBSControl/scripts/example_solflag.py
index 64d2da1c50e..977186c23e8 100644
--- a/CEP/Calibration/BBSControl/scripts/example_solflag.py
+++ b/CEP/Calibration/BBSControl/scripts/example_solflag.py
@@ -1,3 +1,3 @@
-import solflag
+import lofar.solutions
-solflag.flag("test.MS", "instrument.db", 20, 3.0)
+lofar.solutions.flag("test.MS", "instrument.db", 20, 3.0)
diff --git a/CEP/Calibration/BBSControl/scripts/example_solplot.py b/CEP/Calibration/BBSControl/scripts/example_solplot.py
index 98cfdfb7957..3b105397c3b 100644
--- a/CEP/Calibration/BBSControl/scripts/example_solplot.py
+++ b/CEP/Calibration/BBSControl/scripts/example_solplot.py
@@ -1,9 +1,9 @@
import lofar.parmdb
-import solplot
+import lofar.solutions
db = lofar.parmdb.parmdb("instrument.db")
stations = ["CS00%d_HBA%d" % (x,y) for x in [1,8] for y in range(0,4)]
-(ampl, phase) = solplot.fetch(db, stations)
+(ampl, phase) = lofar.solutions.fetch(db, stations)
-solplot.plot(ampl)
+lofar.solutions.plot(ampl)
diff --git a/CEP/Calibration/BBSControl/scripts/solflag.py b/CEP/Calibration/BBSControl/scripts/solflag.py
index 69441ddc6ad..92ae7110352 100644
--- a/CEP/Calibration/BBSControl/scripts/solflag.py
+++ b/CEP/Calibration/BBSControl/scripts/solflag.py
@@ -1,7 +1,9 @@
import sys
+import math
import numpy
import pylab
import pyrap.tables
+import lofar.parmdb
import solfetch
def flag(msName, dbName, half_window, threshold, sources=None, storeFlags=True,
@@ -122,7 +124,7 @@ def flag(msName, dbName, half_window, threshold, sources=None, storeFlags=True,
pylab.clf()
pylab.subplot("21%d" % (el + 1))
- pylab.plot(ampl[el][src][stat], 'k-')
+ pylab.plot(ampl[el][src][stat], 'r-')
pylab.plot(x_axis, sol_masked, 'go', markersize=4)
# Merge flags based on the solutions for the current direction
--
GitLab