Skip to content

Commit

Permalink
change class name with camel case
Browse files Browse the repository at this point in the history
  • Loading branch information
DanicaSTFC committed Dec 4, 2023
1 parent 874f370 commit f0997a7
Show file tree
Hide file tree
Showing 5 changed files with 454 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import matplotlib.pyplot as plt
from matplotlib.patches import Rectangle

class automatic_registration:
class AutomaticRegistration:

def __init__(self, im0, im1, p3d_0, size):
"""
Expand Down Expand Up @@ -376,13 +376,13 @@ def run(self):
print("---------------End cycles part user volume.----------------------------\n\n\n\n\n")
print("test")

class automatic_registration_with_plotting(automatic_registration):
class AutomaticRegistrationWithPlotting(AutomaticRegistration):
def __init__(self,intermediate_plot,filename0,filename1,outputfolder,save, *args,**kwargs):
self.intermediate_plot = intermediate_plot
self.filenames = [filename0,filename1]
self.outputfolder = outputfolder
self.save = save
super(automatic_registration_with_plotting, self).__init__(*args,**kwargs)
super(AutomaticRegistrationWithPlotting, self).__init__(*args,**kwargs)

def iterative_func(self,im0,im1, err):
DD3d, err = self.calc_shift(im0, im1, err)
Expand Down
6 changes: 3 additions & 3 deletions scripts/Automatic_registration_script_demo.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os
import sys
import numpy as np
from idvc.utils.class_automatic_registration import automatic_registration, automatic_registration_with_plotting
from idvc.utils.classAutomaticRegistration import AutomaticRegistration, AutomaticRegistrationWithPlotting
#from cil.utilities.display import show2D, show_geometry

# Code introduction
Expand Down Expand Up @@ -151,11 +151,11 @@ def func_simulate_data():
#-----------------------------------------------------------------
# create an object of the class or the class with plottings
if intermediate_plot is False:
object = automatic_registration(image0,image1,p3d_0,size)
object = AutomaticRegistration(image0,image1,p3d_0,size)
# run automatic registration
object.run()
else:
object = automatic_registration_with_plotting(intermediate_plot,filename0,filename1,outputfolder,save, image0,image1,p3d_0,size)
object = AutomaticRegistrationWithPlotting(intermediate_plot,filename0,filename1,outputfolder,save, image0,image1,p3d_0,size)
# run automatic registration
object.run()
#visualise plots
Expand Down
4 changes: 2 additions & 2 deletions src/idvc/dvc_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@

import logging

from idvc.utils.class_automatic_registration import automatic_registration
from idvc.utils.classAutomaticRegistration import AutomaticRegistration

class MainWindow(QMainWindow):
def __init__(self):
Expand Down Expand Up @@ -1873,7 +1873,7 @@ def automatic_reg_run(self):
print(p3d_0.dtype)

# run code
automatic_registration_object = automatic_registration(image0,image1, p3d_0, size)
automatic_registration_object = AutomaticRegistration(image0,image1, p3d_0, size)
automatic_registration_object.run()
DD3d_accumulate=automatic_registration_object.DD3d_accumulate

Expand Down
Loading

0 comments on commit f0997a7

Please sign in to comment.