diff --git a/ASML_JobCreator/Cell.py b/ASML_JobCreator/Cell.py index e9350a2..ad0c940 100644 --- a/ASML_JobCreator/Cell.py +++ b/ASML_JobCreator/Cell.py @@ -99,7 +99,7 @@ def get_CellSize(self): try: return self.CellSize except AttributeError: - if WARN(): warn("Using default values for `CellSize`.") + if WARN(): print("Using default values for `CellSize`.") self.set_CellSize( Defaults.CELL_SIZE) return self.CellSize #end @@ -117,7 +117,7 @@ def get_MatrixShift(self): try: return self.MatrixShift except AttributeError: - if WARN(): warn("Using default values for `MatrixShift`.") + if WARN(): print("Using default values for `MatrixShift`.") self.set_MatrixShift( Defaults.MATRIX_SHIFT ) return self.MatrixShift #end @@ -128,7 +128,7 @@ def get_NumberDiePerCell(self): try: return self.NumberDiePerCell except AttributeError: - if WARN(): warn("Using default values for `NumberDiePerCell`.") + if WARN(): print("Using default values for `NumberDiePerCell`.") self.NumberDiePerCell = Defaults.CELL_SIZE return self.NumberDiePerCell #end @@ -138,7 +138,7 @@ def get_MinNumberDie(self): try: return self.MinNumberDie except AttributeError: - if WARN(): warn("Using default values for `MinNumberDie`.") + if WARN(): print("Using default values for `MinNumberDie`.") self.MinNumberDie = Defaults.MIN_NUMBER_DIES return self.MinNumberDie #end diff --git a/ASML_JobCreator/Image.py b/ASML_JobCreator/Image.py index c7baefe..12f95b3 100644 --- a/ASML_JobCreator/Image.py +++ b/ASML_JobCreator/Image.py @@ -127,7 +127,7 @@ def get_CellSize(self): try: return self.CellSize except AttributeError: - if WARN(): warn("Using default values for `CellSize`.") + if WARN(): print("Using default values for `CellSize`.") self.set_CellSize( Defaults.CELL_SIZE) return self.CellSize #end diff --git a/ASML_JobCreator/Job.py b/ASML_JobCreator/Job.py index f252827..1ee34cc 100644 --- a/ASML_JobCreator/Job.py +++ b/ASML_JobCreator/Job.py @@ -103,7 +103,7 @@ def get_comment(self): try: return (self.comment_line1, self.comment_line2, self.comment_line3) except AttributeError: - if WARN(): warn("Using default values for Job `comment`.") + if WARN(): print("Using default values for Job `comment`.") self.comment_line1, self.comment_line2, self.comment_line3 = \ Defaults.comment_line1, Defaults.comment_line2, Defaults.comment_line3 return (self.comment_line1, self.comment_line2, self.comment_line3) @@ -393,7 +393,7 @@ def add(string="", cmd='', val=[0,0], tab=tab, integers=False): LyrIDstr = L.LayerID else: warnstr = 'Layer # %i: Layer ID string "%s" is invalid, setting ID string to layer number.' % (i, str(L.LayerID)) - if WARN(): warn(warnstr) + if WARN(): print(warnstr) LyrIDstr = str(i) L.LayerID = LyrIDstr #end if(LayerID is alphanumeric) diff --git a/ASML_JobCreator/Layer.py b/ASML_JobCreator/Layer.py index 6a21347..0730d6d 100644 --- a/ASML_JobCreator/Layer.py +++ b/ASML_JobCreator/Layer.py @@ -146,7 +146,7 @@ def get_LayerShift(self): try: return self.LayerShift except AttributeError: - if WARN(): warn("Using default values for `LayerShift`.") + if WARN(): print("Using default values for `LayerShift`.") self.set_LayerShift( Defaults.ProcessData_LAYER_SHIFT) return self.LayerShift #end @@ -177,7 +177,7 @@ def get_GlobalLevelPoints(self): try: return (self.GlobalLevel_Point1, self.GlobalLevel_Point2, self.GlobalLevel_Point3) except AttributeError: - if WARN(): warn("Using default values for `GlobalLevel_Point1/2/3`.") + if WARN(): print("Using default values for `GlobalLevel_Point1/2/3`.") self.set_GlobalLevelPoints(xy1=[0,0], xy2=[0,0], xy3=[0,0] ) return (self.GlobalLevel_Point1, self.GlobalLevel_Point2, self.GlobalLevel_Point3) #end diff --git a/Module Test v1.py b/Module Test v1.py deleted file mode 100644 index c58c0ab..0000000 --- a/Module Test v1.py +++ /dev/null @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- -""" -Created on %(date)s - -@author: %(username)s -""" - -#################################################### -# Module setup etc. - -import numpy as np # NumPy (multidimensional arrays, linear algebra, ...) -import matplotlib.pyplot as plt # Matplotlib's pyplot: MATLAB-like syntax - -#import scipy as sp # SciPy (signal and image processing library) -#import matplotlib as mpl # Matplotlib (2D/3D plotting library) -#from pylab import * # Matplotlib's pylab interface -plt.ion() # Turn on Matplotlib's interactive mode - -# More modules -import time # Get current date/time - -#################################################### - -print('Running...') - - -import ASML_JobCreator as asml -MyJob = asml.Job() - -print( MyJob.get_comment() ) -MyJob.set_comment("Demo Job", "Exported from ", "Python ASML_JobCreator") -print( MyJob.get_comment() ) - -MyJob.Cell.set_CellSize( [4,4] ) - -MyJob.Cell.set_MatrixShift( [2,2] ) # defaults - -Res = MyJob.Image("UCSB_Res", "UCSB-OPC1", sizeXY=[3, 3], shiftXY=[4,5]) -MA6 = MyJob.Image("UCSB_MA6", "UCSB-OPC1", sizeXY=[2, 2], shiftXY=[-4,-5]) -GCA = MyJob.Image("UCSB_GCA", "UCSB-OPC1", sizeXY=[2, 2], shiftXY=[0,-2]) - -MA6.distribute( cellCR=[-5,-5], shiftXY=[-2,-2] ) -GCA.distribute( cellCR=[5,5], shiftXY=[-2,-2] ) - -for r in range(10): - for c in range(10): - Res.distribute( [c,r] ) - #end for(c) -#end for(r) -print( Res ) - -MyJob.add_Images(Res,MA6, GCA) - -# is this necessary? -ZeroLyr = MyJob.Layer() -MyJob.add_Layers(ZeroLyr) - - -MetalLyr = MyJob.Layer( LayerID="Metal" ) -MetalLyr.expose_Image(Res, Energy=21, Focus=-0.10) -MetalLyr.expose_Image(MA6, Energy=22) -MetalLyr.expose_Image(GCA, Energy=22) -MyJob.add_Layers(MetalLyr) - - -print(MyJob) - -MyJob.export('TestJob_NoAlign.txt') - - - - - -print('done.') - - -