From 5661ba6301c9ba8082c693202e8d8a3b5896ff9d Mon Sep 17 00:00:00 2001 From: Joshua Hoskins Date: Fri, 7 Feb 2025 18:34:52 -0500 Subject: [PATCH] Add functions for baseline conversion and conversion of the parameter array to a matrix form that can be used to do the correction. --- factory_jones.ipynb | 30 +++++++++++++----------------- factory_methods.ipynb | 4 +--- src/calviper/factory/gain.py | 2 +- 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/factory_jones.ipynb b/factory_jones.ipynb index ebb8ebe..ed547a9 100644 --- a/factory_jones.ipynb +++ b/factory_jones.ipynb @@ -277,7 +277,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "[\u001b[38;2;128;05;128m2025-02-07 12:23:34,948\u001b[0m] \u001b[38;2;50;50;205m INFO\u001b[0m\u001b[38;2;112;128;144m viperlog: \u001b[0m Module path: \u001b[38;2;50;50;205m/home/mystletainn/Development/calviper/src/calviper\u001b[0m \n" + "[\u001B[38;2;128;05;128m2025-02-07 12:23:34,948\u001B[0m] \u001B[38;2;50;50;205m INFO\u001B[0m\u001B[38;2;112;128;144m viperlog: \u001B[0m Module path: \u001B[38;2;50;50;205m/home/mystletainn/Development/calviper/src/calviper\u001B[0m \n" ] } ], @@ -291,9 +291,7 @@ "id": "6403894b-a634-45a8-9219-05aed71457f1", "metadata": {}, "outputs": [], - "source": [ - "G.gain.empty()" - ] + "source": "G.gain.initialize()" }, { "cell_type": "code", @@ -1039,16 +1037,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "[\u001b[38;2;128;05;128m2025-02-07 12:23:38,194\u001b[0m] \u001b[38;2;50;50;205m INFO\u001b[0m\u001b[38;2;112;128;144m viperlog: \u001b[0m iteration: 0\tloss: 3.851602077484131 \n", - "[\u001b[38;2;128;05;128m2025-02-07 12:23:38,195\u001b[0m] \u001b[38;2;50;50;205m INFO\u001b[0m\u001b[38;2;112;128;144m viperlog: \u001b[0m iteration: 5\tloss: 0.010313255712389946 \n", - "[\u001b[38;2;128;05;128m2025-02-07 12:23:38,197\u001b[0m] \u001b[38;2;50;50;205m INFO\u001b[0m\u001b[38;2;112;128;144m viperlog: \u001b[0m iteration: 10\tloss: 0.0034813820384442806 \n", - "[\u001b[38;2;128;05;128m2025-02-07 12:23:38,198\u001b[0m] \u001b[38;2;50;50;205m INFO\u001b[0m\u001b[38;2;112;128;144m viperlog: \u001b[0m iteration: 15\tloss: 0.0034759799018502235 \n", - "[\u001b[38;2;128;05;128m2025-02-07 12:23:38,199\u001b[0m] \u001b[38;2;50;50;205m INFO\u001b[0m\u001b[38;2;112;128;144m viperlog: \u001b[0m iteration: 20\tloss: 0.0034757850226014853 \n", - "[\u001b[38;2;128;05;128m2025-02-07 12:23:38,200\u001b[0m] \u001b[38;2;50;50;205m INFO\u001b[0m\u001b[38;2;112;128;144m viperlog: \u001b[0m iteration: 25\tloss: 0.003475750330835581 \n", - "[\u001b[38;2;128;05;128m2025-02-07 12:23:38,202\u001b[0m] \u001b[38;2;50;50;205m INFO\u001b[0m\u001b[38;2;112;128;144m viperlog: \u001b[0m iteration: 30\tloss: 0.003475742880254984 \n", - "[\u001b[38;2;128;05;128m2025-02-07 12:23:38,203\u001b[0m] \u001b[38;2;50;50;205m INFO\u001b[0m\u001b[38;2;112;128;144m viperlog: \u001b[0m iteration: 35\tloss: 0.0034757456742227077 \n", - "[\u001b[38;2;128;05;128m2025-02-07 12:23:38,204\u001b[0m] \u001b[38;2;50;50;205m INFO\u001b[0m\u001b[38;2;112;128;144m viperlog: \u001b[0m iteration: 40\tloss: 0.0034757573157548904 \n", - "[\u001b[38;2;128;05;128m2025-02-07 12:23:38,206\u001b[0m] \u001b[38;2;50;50;205m INFO\u001b[0m\u001b[38;2;112;128;144m viperlog: \u001b[0m iteration: 45\tloss: 0.003475775709375739 \n" + "[\u001B[38;2;128;05;128m2025-02-07 12:23:38,194\u001B[0m] \u001B[38;2;50;50;205m INFO\u001B[0m\u001B[38;2;112;128;144m viperlog: \u001B[0m iteration: 0\tloss: 3.851602077484131 \n", + "[\u001B[38;2;128;05;128m2025-02-07 12:23:38,195\u001B[0m] \u001B[38;2;50;50;205m INFO\u001B[0m\u001B[38;2;112;128;144m viperlog: \u001B[0m iteration: 5\tloss: 0.010313255712389946 \n", + "[\u001B[38;2;128;05;128m2025-02-07 12:23:38,197\u001B[0m] \u001B[38;2;50;50;205m INFO\u001B[0m\u001B[38;2;112;128;144m viperlog: \u001B[0m iteration: 10\tloss: 0.0034813820384442806 \n", + "[\u001B[38;2;128;05;128m2025-02-07 12:23:38,198\u001B[0m] \u001B[38;2;50;50;205m INFO\u001B[0m\u001B[38;2;112;128;144m viperlog: \u001B[0m iteration: 15\tloss: 0.0034759799018502235 \n", + "[\u001B[38;2;128;05;128m2025-02-07 12:23:38,199\u001B[0m] \u001B[38;2;50;50;205m INFO\u001B[0m\u001B[38;2;112;128;144m viperlog: \u001B[0m iteration: 20\tloss: 0.0034757850226014853 \n", + "[\u001B[38;2;128;05;128m2025-02-07 12:23:38,200\u001B[0m] \u001B[38;2;50;50;205m INFO\u001B[0m\u001B[38;2;112;128;144m viperlog: \u001B[0m iteration: 25\tloss: 0.003475750330835581 \n", + "[\u001B[38;2;128;05;128m2025-02-07 12:23:38,202\u001B[0m] \u001B[38;2;50;50;205m INFO\u001B[0m\u001B[38;2;112;128;144m viperlog: \u001B[0m iteration: 30\tloss: 0.003475742880254984 \n", + "[\u001B[38;2;128;05;128m2025-02-07 12:23:38,203\u001B[0m] \u001B[38;2;50;50;205m INFO\u001B[0m\u001B[38;2;112;128;144m viperlog: \u001B[0m iteration: 35\tloss: 0.0034757456742227077 \n", + "[\u001B[38;2;128;05;128m2025-02-07 12:23:38,204\u001B[0m] \u001B[38;2;50;50;205m INFO\u001B[0m\u001B[38;2;112;128;144m viperlog: \u001B[0m iteration: 40\tloss: 0.0034757573157548904 \n", + "[\u001B[38;2;128;05;128m2025-02-07 12:23:38,206\u001B[0m] \u001B[38;2;50;50;205m INFO\u001B[0m\u001B[38;2;112;128;144m viperlog: \u001B[0m iteration: 45\tloss: 0.003475775709375739 \n" ] } ], @@ -1145,9 +1143,7 @@ "id": "5acbfa41-2068-4aff-9636-ffd08bfd1199", "metadata": {}, "outputs": [], - "source": [ - "converted = to_baseline(parameter)" - ] + "source": "converted = calviper.math.tools.to_baseline(parameter)" }, { "cell_type": "code", diff --git a/factory_methods.ipynb b/factory_methods.ipynb index fef0e2f..56bdac0 100644 --- a/factory_methods.ipynb +++ b/factory_methods.ipynb @@ -118,9 +118,7 @@ "id": "1132e46e-545c-45e7-a69b-2591c43bb5de", "metadata": {}, "outputs": [], - "source": [ - "jones.gain.empty()" - ] + "source": "jones.gain.initialize()" }, { "cell_type": "code", diff --git a/src/calviper/factory/gain.py b/src/calviper/factory/gain.py index 96de3ed..ef9b7f7 100644 --- a/src/calviper/factory/gain.py +++ b/src/calviper/factory/gain.py @@ -43,7 +43,7 @@ def matrix(self, array: np.ndarray) -> None: def example(self): logger.info("This is a gain matrix specific function that does something with the data.") - def empty(self): + def initialize(self): identity = np.identity(self._object.sizes["polarization"], dtype=self.dtype) matrix = xr.DataArray(