Latest stuff I found from Harishharish

4 files changed, 188 insertions, 0 deletions

diff --git a/src/operators/ProjectionOperator.py b/src/operators/ProjectionOperator.py
new file mode 100644
index 0000000..76d5c0c
--- /dev/null
+++ b/src/operators/ProjectionOperator.py
@@ -0,0 +1,67 @@
+# ========================================================================
+# Copyright 2019 Science Technology Facilities Council
+# Copyright 2019 University of Manchester
+#
+# This work is part of the Core Imaging Library developed by Science Technology
+# Facilities Council and University of Manchester
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# =========================================================================
+
+from cil.framework import DataOrder
+from cil.optimisation.operators import LinearOperator, ChannelwiseOperator
+from src.operators.UfoStandardProjector import UfoStandardProjector
+from src.operators.UfoStackedProjector import UfoStackedProjector
+
+class ProjectionOperator(LinearOperator):
+    """Ufo projector modified to use DataSet and geometry."""
+
+    def __init__(self, geomv, geomp, stacked=True, precision_mode='single', stack_num=2):
+
+        super(ProjectionOperator, self).__init__(domain_geometry=geomv, range_geometry=geomp)
+
+        DataOrder.check_order_for_engine('astra', geomv)
+        DataOrder.check_order_for_engine('astra', geomp)
+
+        self.volume_geometry = geomv
+        self.sinogram_geometry = geomp
+
+        sinogram_geometry_sc = geomp.subset(channel=0)
+        volume_geometry_sc = geomv.subset(channel=0)
+
+        if stacked==True:
+            operator = UfoStackedProjector(volume_geometry_sc, sinogram_geometry_sc, precision_mode, stack_num)
+        else:
+            operator = UfoStandardProjector(volume_geometry_sc, sinogram_geometry_sc)
+
+        if geomp.channels > 1:
+            operator_full = ChannelwiseOperator(operator, self.sinogram_geometry.channels, dimension='prepend')
+            self.operator = operator_full
+        else:
+            self.operator = operator
+
+    def direct(self, IM, out=None):
+        return self.operator.direct(IM, out=out)
+
+    def adjoint(self, DATA, out=None):
+        return self.operator.adjoint(DATA, out=out)
+
+    def calculate_norm(self):
+        return self.operator.norm()
+
+    def domain_geometry(self):
+        return self.volume_geometry
+
+    def range_geometry(self):
+        return self.sinogram_geometry
diff --git a/src/operators/UfoStackedProjector.py b/src/operators/UfoStackedProjector.py
new file mode 100644
index 0000000..e2e65fd
--- /dev/null
+++ b/src/operators/UfoStackedProjector.py
@@ -0,0 +1,60 @@
+# ========================================================================
+# Copyright 2019 Science Technology Facilities Council
+# Copyright 2019 University of Manchester
+#
+# This work is part of the Core Imaging Library developed by Science Technology
+# Facilities Council and University of Manchester
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# =========================================================================
+
+from cil.optimisation.operators import LinearOperator
+from src.processors import UfoStackedForwardProjector, UfoStackedBackProjector
+
+class UfoStackedProjector(LinearOperator):
+    """UFO projector modified to use DataSet and geometry."""
+
+    def __init__(self, geomv, geomp, precision_mode='single', stack_num=2):
+
+        super(UfoStackedProjector, self).__init__(domain_geometry=geomv, range_geometry=geomp)
+
+        self.sinogram_geometry = geomp
+        self.volume_geometry = geomv
+
+        self.fp = UfoStackedForwardProjector(volume_geometry=geomv, sinogram_geometry=geomp,
+                                             precision_mode=precision_mode, stack_num=stack_num)
+        self.bp = UfoStackedBackProjector(volume_geometry=geomv, sinogram_geometry=geomp,
+                                          precision_mode=precision_mode, stack_num=stack_num)
+
+    def direct(self, IM, out=None):
+        self.fp.set_input(IM)
+
+        if out is None:
+            return self.fp.get_output()
+        else:
+            out.fill(self.fp.get_output())
+
+    def adjoint(self, DATA, out=None):
+        self.bp.set_input(DATA)
+
+        if out is None:
+            return self.bp.get_output()
+        else:
+            out.fill(self.bp.get_output())
+
+    def domain_geometry(self):
+        return self.volume_geometry
+
+    def range_geometry(self):
+        return self.sinogram_geometry
diff --git a/src/operators/UfoStandardProjector.py b/src/operators/UfoStandardProjector.py
new file mode 100644
index 0000000..cef1a36
--- /dev/null
+++ b/src/operators/UfoStandardProjector.py
@@ -0,0 +1,58 @@
+# ========================================================================
+# Copyright 2019 Science Technology Facilities Council
+# Copyright 2019 University of Manchester
+#
+# This work is part of the Core Imaging Library developed by Science Technology
+# Facilities Council and University of Manchester
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# =========================================================================
+
+from cil.optimisation.operators import LinearOperator
+from src.processors import UfoStandardForwardProjector, UfoStandardBackProjector
+
+class UfoStandardProjector(LinearOperator):
+    """UFO projector modified to use DataSet and geometry."""
+
+    def __init__(self, geomv, geomp):
+
+        super(UfoStandardProjector, self).__init__(domain_geometry=geomv, range_geometry=geomp)
+
+        self.sinogram_geometry = geomp
+        self.volume_geometry = geomv
+
+        self.fp = UfoStandardForwardProjector(volume_geometry=geomv, sinogram_geometry=geomp)
+        self.bp = UfoStandardBackProjector(volume_geometry=geomv, sinogram_geometry=geomp)
+
+    def direct(self, IM, out=None):
+        self.fp.set_input(IM)
+
+        if out is None:
+            return self.fp.get_output()
+        else:
+            out.fill(self.fp.get_output())
+
+    def adjoint(self, DATA, out=None):
+        self.bp.set_input(DATA)
+
+        if out is None:
+            return self.bp.get_output()
+        else:
+            out.fill(self.bp.get_output())
+
+    def domain_geometry(self):
+        return self.volume_geometry
+
+    def range_geometry(self):
+        return self.sinogram_geometry
diff --git a/src/operators/__init__.py b/src/operators/__init__.py
new file mode 100644
index 0000000..b5e6d8c
--- /dev/null
+++ b/src/operators/__init__.py
@@ -0,0 +1,3 @@
+from .ProjectionOperator import ProjectionOperator
+from .UfoStandardProjector import UfoStandardProjector
+from .UfoStackedProjector import UfoStackedProjector