Loading csst_ifs_sim/csst_ifs_sim.py +7 −3 Original line number Diff line number Diff line Loading @@ -1934,7 +1934,7 @@ class IFSsimulator(): ############################################################################### ############################################################################### def configure(self, simnumber,dir_path, result_path): def configure(self, sourcein, dir_path, result_path, simnumber, debug, applyhole): """ Loading Loading @@ -1972,7 +1972,7 @@ class IFSsimulator(): # self.information['holemask'] if self.source == 'LAMP': if self.information['holemask'] == 'yes': if applyhole == 'yes': ss = '_with_hole_' else: ss = '_no_hole_' Loading Loading @@ -5461,7 +5461,8 @@ class IFSsimulator(): self.source = sourcein self.simnumber = simnumber self.configure(simnumber,dir_path,result_path) # print the configfile name and path; #self.configure(simnumber,dir_path,result_path) # print the configfile name and path; self.debug = self.information['debug'] Loading Loading @@ -5756,6 +5757,9 @@ def runIFSsim(sourcein, configfile, dir_path, result_path, iLoop, debug, applyho simulate = dict() simulate[iLoop] = IFSsimulator(configfile) simulate[iLoop].configure(sourcein, dir_path, result_path, iLoop, debug, applyhole) # load the configfile; if applyhole == 'yes' and sourcein == 'LAMP': simulate[iLoop].information['holemask'] = 'yes' else: Loading Loading
csst_ifs_sim/csst_ifs_sim.py +7 −3 Original line number Diff line number Diff line Loading @@ -1934,7 +1934,7 @@ class IFSsimulator(): ############################################################################### ############################################################################### def configure(self, simnumber,dir_path, result_path): def configure(self, sourcein, dir_path, result_path, simnumber, debug, applyhole): """ Loading Loading @@ -1972,7 +1972,7 @@ class IFSsimulator(): # self.information['holemask'] if self.source == 'LAMP': if self.information['holemask'] == 'yes': if applyhole == 'yes': ss = '_with_hole_' else: ss = '_no_hole_' Loading Loading @@ -5461,7 +5461,8 @@ class IFSsimulator(): self.source = sourcein self.simnumber = simnumber self.configure(simnumber,dir_path,result_path) # print the configfile name and path; #self.configure(simnumber,dir_path,result_path) # print the configfile name and path; self.debug = self.information['debug'] Loading Loading @@ -5756,6 +5757,9 @@ def runIFSsim(sourcein, configfile, dir_path, result_path, iLoop, debug, applyho simulate = dict() simulate[iLoop] = IFSsimulator(configfile) simulate[iLoop].configure(sourcein, dir_path, result_path, iLoop, debug, applyhole) # load the configfile; if applyhole == 'yes' and sourcein == 'LAMP': simulate[iLoop].information['holemask'] = 'yes' else: Loading