From 23864c163ec14feef566e7712dd8f37cb2e137bc Mon Sep 17 00:00:00 2001 From: Martin Hardcastle Date: Sat, 24 Jun 2017 18:02:07 +0100 Subject: [PATCH 1/2] Spell check --- DDFacet/Array/ModLinAlg.py | 4 ++-- DDFacet/Array/shared_dict.py | 2 +- DDFacet/CleanSHM.py | 2 +- DDFacet/Data/ClassMS.py | 4 ++-- DDFacet/Imager/ClassDeconvMachine.py | 10 ++++---- DDFacet/Imager/ClassImageDeconvMachine.py | 2 +- .../Imager/HOGBOM/ClassModelMachineHogbom.py | 4 ++-- .../MORESANE/ClassModelMachineMORESANE.py | 16 ++++++------- DDFacet/Imager/MSMF/ClassModelMachineMSMF.py | 16 ++++++------- DDFacet/Imager/ModModelMachine.py | 2 +- .../Imager/SSD/ClassIslandDistanceMachine.py | 2 +- DDFacet/Imager/SSD/ClassModelMachineSSD.py | 24 +++++++++---------- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/DDFacet/Array/ModLinAlg.py b/DDFacet/Array/ModLinAlg.py index 859606bf..81f812f7 100644 --- a/DDFacet/Array/ModLinAlg.py +++ b/DDFacet/Array/ModLinAlg.py @@ -333,7 +333,7 @@ def test_Dot_ListBlockMat_Mat(): T=ClassTimeIt.ClassTimeIt() - print "Dimentions A[%s], B[%s]"%(BlocksMat.shape,B.shape) + print "Dimensions A[%s], B[%s]"%(BlocksMat.shape,B.shape) R0=Dot_ListBlockMat_Mat(ListBlocks,B) T.timeit("ListProd") R1=np.dot(BlocksMat,B) @@ -361,7 +361,7 @@ def test_Dot_ListBlockMat_Mat_Big(): T=ClassTimeIt.ClassTimeIt() - print "Dimentions A[%ix%s -> %s], B[%s]"%(nblocks,ThisBlock.shape,(nblocks*n,nblocks*n),B.shape) + print "Dimensions A[%ix%s -> %s], B[%s]"%(nblocks,ThisBlock.shape,(nblocks*n,nblocks*n),B.shape) R0=Dot_ListBlockMat_Mat(ListBlocks,B) T.timeit("ListProd") diff --git a/DDFacet/Array/shared_dict.py b/DDFacet/Array/shared_dict.py index e57621ab..588da015 100644 --- a/DDFacet/Array/shared_dict.py +++ b/DDFacet/Array/shared_dict.py @@ -50,7 +50,7 @@ def __init__(self, path, exc_info): self.exc_info = exc_info class ItemProxy(object): - """Base class for helper class used to defer loading of ShareDict items until they are actually requested""" + """Base class for helper class used to defer loading of SharedDict items until they are actually requested""" def __init__(self, path): self.path = path def load(self): diff --git a/DDFacet/CleanSHM.py b/DDFacet/CleanSHM.py index 069126e1..08e0d4e3 100755 --- a/DDFacet/CleanSHM.py +++ b/DDFacet/CleanSHM.py @@ -36,7 +36,7 @@ def read_options(): opt = optparse.OptionParser(usage='Usage: %prog ',version='%prog version 1.0',description=desc) group = optparse.OptionGroup(opt, "* SHM") - group.add_option('--ID',help='ID of ssared memory to be deleted, default is %default',default=None) + group.add_option('--ID',help='ID of shared memory to be deleted, default is %default',default=None) opt.add_option_group(group) options, arguments = opt.parse_args() diff --git a/DDFacet/Data/ClassMS.py b/DDFacet/Data/ClassMS.py index bb1ac834..035d29f6 100755 --- a/DDFacet/Data/ClassMS.py +++ b/DDFacet/Data/ClassMS.py @@ -1272,7 +1272,7 @@ def PutVisColumn(self, colname, vis, row0, row1, likecol="DATA", sort_index=None def SaveVis(self,vis=None,Col="CORRECTED_DATA",spw=0,DoPrint=True): if vis is None: vis=self.data - if DoPrint: print>>log, "Writting data in column %s" % ModColor.Str(Col, col="green") + if DoPrint: print>>log, "Writing data in column %s" % ModColor.Str(Col, col="green") table_all=self.GiveMainTable(readonly=False) if self.swapped: @@ -1553,7 +1553,7 @@ def AddUVW_dt(self): pBAR.render(ant0+1, na) - print>>log,"Writting in column UVWDT" + print>>log,"Writing in column UVWDT" t.putcol("UVWDT",UVW_dt) t.close() diff --git a/DDFacet/Imager/ClassDeconvMachine.py b/DDFacet/Imager/ClassDeconvMachine.py index aa8a48c0..f713b712 100644 --- a/DDFacet/Imager/ClassDeconvMachine.py +++ b/DDFacet/Imager/ClassDeconvMachine.py @@ -1330,7 +1330,7 @@ def GiveMetroModel(self): # #################### # Run MetroClean - print>>log,"Runing a Metropolis-Hastings MCMC on islands larger than %i pixels"%self.GD["SSDClean"]["RestoreMetroSwitch"] + print>>log,"Running a Metropolis-Hastings MCMC on islands larger than %i pixels"%self.GD["SSDClean"]["RestoreMetroSwitch"] DeconvMachine.setDeconvMode(Mode="MetroClean") DeconvMachine.Update(self.DicoDirty) repMinor, continue_deconv, update_model = DeconvMachine.Deconvolve() @@ -1426,7 +1426,7 @@ def RestoreAndShift(self): SmoothNorm=Norm sqrtSmoothNorm=sqrtNorm else: - print>>log,ModColor.Str("Using the freq-averaged smooth beam to normalise the apparant images",col="blue") + print>>log,ModColor.Str("Using the freq-averaged smooth beam to normalise the apparent images",col="blue") SmoothNorm=self.FacetMachine.MeanSmoothJonesNorm sqrtSmoothNorm=np.sqrt(SmoothNorm) @@ -1474,7 +1474,7 @@ def Restore(self): try: ModelMachine.PutBackSubsComps() except: - print>>log, ModColor.Str("Failed Putting back substracted components") + print>>log, ModColor.Str("Failed putting back subtracted components") # do we have a non-trivial norm (i.e. DDE solutions or beam)? # @cyriltasse: maybe there's a quicker way to check? @@ -1518,7 +1518,7 @@ def smooth_sqrtnorm(): if self.FacetMachine.MeanSmoothJonesNorm is None: a = self.MeanJonesNorm else: - print>>log,ModColor.Str("Using the freq-averaged smooth beam to normalise the apparant images",col="blue") + print>>log,ModColor.Str("Using the freq-averaged smooth beam to normalise the apparent images",col="blue") a=self.FacetMachine.MeanSmoothJonesNorm else: a=np.array([1]) @@ -1532,7 +1532,7 @@ def smooth_sqrtnormcube(): if self.FacetMachine.MeanSmoothJonesNorm is None: a = self.JonesNorm else: - print>>log,ModColor.Str("Using the smooth beam to normalise the apparant images",col="blue") + print>>log,ModColor.Str("Using the smooth beam to normalise the apparent images",col="blue") a=self.FacetMachine.SmoothJonesNorm else: a=np.array([1]) diff --git a/DDFacet/Imager/ClassImageDeconvMachine.py b/DDFacet/Imager/ClassImageDeconvMachine.py index 356efaa4..e4a8a2fa 100644 --- a/DDFacet/Imager/ClassImageDeconvMachine.py +++ b/DDFacet/Imager/ClassImageDeconvMachine.py @@ -402,7 +402,7 @@ def Deconvolve(self, Nminor=None, ch=0): mm0,mm1=self.Dirty.min(),self.Dirty.max() print>>log, " Dirty image peak flux = %7.3f Jy [(min, max) = (%7.3f, %7.3f) Jy]"%(MaxDirty,mm0,mm1) print>>log, " RMS threshold flux = %7.3f Jy [rms = %7.3f Jy]"%(FluxLimit, RMS) - print>>log, " Sidelobs threshold flux = %7.3f Jy [sidelobe = %7.3f of peak]"%(Threshold_SideLobe,self.SideLobeLevel) + print>>log, " Sidelobe threshold flux = %7.3f Jy [sidelobe = %7.3f of peak]"%(Threshold_SideLobe,self.SideLobeLevel) MaxModelInit=np.max(np.abs(self.ModelImage)) diff --git a/DDFacet/Imager/HOGBOM/ClassModelMachineHogbom.py b/DDFacet/Imager/HOGBOM/ClassModelMachineHogbom.py index 5e0513da..c959b3ce 100644 --- a/DDFacet/Imager/HOGBOM/ClassModelMachineHogbom.py +++ b/DDFacet/Imager/HOGBOM/ClassModelMachineHogbom.py @@ -193,7 +193,7 @@ def PutBackSubsComps(self): # RestoreDico=self.GD["Data"]["RestoreDico"] RestoreDico = DicoSolsFile["ModelName"][()][0:-4] + ".DicoModel" - print>> log, "Adding previously substracted components" + print>> log, "Adding previously subtracted components" ModelMachine0 = ClassModelMachine(self.GD) ModelMachine0.FromFile(RestoreDico) @@ -213,4 +213,4 @@ def PutBackSubsComps(self): if not ((x1, y1) in self.DicoSMStacked["Comp"].keys()): self.DicoSMStacked["Comp"][(x1, y1)] = ModelMachine0.DicoSMStacked["Comp"][(x0, y0)] else: - self.DicoSMStacked["Comp"][(x1, y1)] += ModelMachine0.DicoSMStacked["Comp"][(x0, y0)] \ No newline at end of file + self.DicoSMStacked["Comp"][(x1, y1)] += ModelMachine0.DicoSMStacked["Comp"][(x0, y0)] diff --git a/DDFacet/Imager/MORESANE/ClassModelMachineMORESANE.py b/DDFacet/Imager/MORESANE/ClassModelMachineMORESANE.py index 6300a51e..d38654ad 100644 --- a/DDFacet/Imager/MORESANE/ClassModelMachineMORESANE.py +++ b/DDFacet/Imager/MORESANE/ClassModelMachineMORESANE.py @@ -230,7 +230,7 @@ def GiveModelImage(self,FreqIn=None): - def setListComponants(self,ListScales): + def setListComponents(self,ListScales): self.ListScales=ListScales @@ -258,8 +258,8 @@ def GiveSpectralIndexMap(self,CellSizeRad=1.,GaussPars=[(1,1,0)],DoConv=True): return alpha - def CleanNegComponants(self,box=20,sig=3,RemoveNeg=True): - print>>log, "Cleaning model dictionary from negative componants with (box, sig) = (%i, %i)"%(box,sig) + def CleanNegComponents(self,box=20,sig=3,RemoveNeg=True): + print>>log, "Cleaning model dictionary from negative components with (box, sig) = (%i, %i)"%(box,sig) ModelImage=self.GiveModelImage(self.DicoSMStacked["RefFreq"])[0,0] Min=scipy.ndimage.filters.minimum_filter(ModelImage,(box,box)) @@ -269,7 +269,7 @@ def CleanNegComponants(self,box=20,sig=3,RemoveNeg=True): if RemoveNeg==False: Lx,Ly=np.where((ModelImage>log, " Removing neg componants too" + print>>log, " Removing neg components too" Lx,Ly=np.where( ((ModelImage>log, " Componant at (%i, %i) not in dict "%key + print>>log, " Component at (%i, %i) not in dict "%key - def CleanMaskedComponants(self,MaskName): - print>>log, "Cleaning model dictionary from masked componants using %s"%(MaskName) + def CleanMaskedComponents(self,MaskName): + print>>log, "Cleaning model dictionary from masked components using %s"%(MaskName) im=image(MaskName) MaskArray=im.getdata()[0,0].T[::-1] for (x,y) in self.DicoSMStacked["Comp"].keys(): @@ -371,7 +371,7 @@ def PutBackSubsComps(self): #RestoreDico=self.GD["Data"]["RestoreDico"] RestoreDico=DicoSolsFile["ModelName"][()][0:-4]+".DicoModel" - print>>log, "Adding previously substracted components" + print>>log, "Adding previously subtracted components" ModelMachine0=ClassModelMachine(self.GD) diff --git a/DDFacet/Imager/MSMF/ClassModelMachineMSMF.py b/DDFacet/Imager/MSMF/ClassModelMachineMSMF.py index e7684588..2bd2e362 100644 --- a/DDFacet/Imager/MSMF/ClassModelMachineMSMF.py +++ b/DDFacet/Imager/MSMF/ClassModelMachineMSMF.py @@ -155,7 +155,7 @@ def AppendComponentToDictStacked(self,key,Fpol,Sols,pol_array_index=0): # entry["SolsArray"][:,pol_array_index] += Weight*SolNorm # >>>>>>> issue-255 - def setListComponants(self,ListScales): + def setListComponents(self,ListScales): self.ListScales=ListScales def GiveSpectralIndexMap(self, threshold=0.1, save_dict=True): @@ -361,8 +361,8 @@ def GiveModelImage(self,FreqIn=None,out=None,DoAbs=False): return ModelImage - def CleanNegComponants(self,box=20,sig=3,RemoveNeg=True): - print>>log, "Cleaning model dictionary from negative componants with (box, sig) = (%i, %i)"%(box,sig) + def CleanNegComponents(self,box=20,sig=3,RemoveNeg=True): + print>>log, "Cleaning model dictionary from negative components with (box, sig) = (%i, %i)"%(box,sig) ModelImage=self.GiveModelImage(self.DicoSMStacked["RefFreq"])[0,0] Min=scipy.ndimage.filters.minimum_filter(ModelImage,(box,box)) @@ -372,7 +372,7 @@ def CleanNegComponants(self,box=20,sig=3,RemoveNeg=True): if RemoveNeg==False: Lx,Ly=np.where((ModelImage>log, " Removing neg componants too" + print>>log, " Removing neg components too" Lx,Ly=np.where( ((ModelImage>log, " Componant at (%i, %i) not in dict "%key + print>>log, " Component at (%i, %i) not in dict "%key - def CleanMaskedComponants(self,MaskName): - print>>log, "Cleaning model dictionary from masked componants using %s"%(MaskName) + def CleanMaskedComponents(self,MaskName): + print>>log, "Cleaning model dictionary from masked components using %s"%(MaskName) im=image(MaskName) MaskArray=im.getdata()[0,0].T[::-1] for (x,y) in self.DicoSMStacked["Comp"].keys(): @@ -473,7 +473,7 @@ def PutBackSubsComps(self): #RestoreDico=self.GD["Data"]["RestoreDico"] RestoreDico=DicoSolsFile["ModelName"][()][0:-4]+".DicoModel" - print>>log, "Adding previously substracted components" + print>>log, "Adding previously subtracted components" ModelMachine0=ClassModelMachine(self.GD) diff --git a/DDFacet/Imager/ModModelMachine.py b/DDFacet/Imager/ModModelMachine.py index c91817df..ae697a88 100644 --- a/DDFacet/Imager/ModModelMachine.py +++ b/DDFacet/Imager/ModModelMachine.py @@ -77,7 +77,7 @@ def GiveMMFromDico(self,DicoSMStacked=None): DicoSMStacked = Dictionary to instantiate ModelMachine with """ if DicoSMStacked["Type"]=="GA": - print>>log,ModColor.Str("Model is of deprecated type GA, overwritting with type SSD") + print>>log,ModColor.Str("Model is of deprecated type GA, overwriting with type SSD") DicoSMStacked["Type"]="SSD" if DicoSMStacked is not None: # If the Dict is provided use it to initialise a model machine diff --git a/DDFacet/Imager/SSD/ClassIslandDistanceMachine.py b/DDFacet/Imager/SSD/ClassIslandDistanceMachine.py index bc0df112..4a6bf642 100644 --- a/DDFacet/Imager/SSD/ClassIslandDistanceMachine.py +++ b/DDFacet/Imager/SSD/ClassIslandDistanceMachine.py @@ -154,7 +154,7 @@ def CalcCrossIslandFlux(self,ListIslands): if self.PSFCross is None: self.CalcCrossIslandPSF(ListIslands) NIslands=len(ListIslands) - print>>log," grouping cross contaninating islands..." + print>>log," grouping cross contaminating islands..." MaxIslandFlux=np.zeros((NIslands,),np.float32) DicoIsland={} diff --git a/DDFacet/Imager/SSD/ClassModelMachineSSD.py b/DDFacet/Imager/SSD/ClassModelMachineSSD.py index e3d836f3..1ad4a741 100644 --- a/DDFacet/Imager/SSD/ClassModelMachineSSD.py +++ b/DDFacet/Imager/SSD/ClassModelMachineSSD.py @@ -101,7 +101,7 @@ def FromFile(self,FileName): def FromDico(self,DicoSMStacked): - print>>log, "Reading dico model from dico with %i componants"%len(DicoSMStacked["Comp"]) + print>>log, "Reading dico model from dico with %i components"%len(DicoSMStacked["Comp"]) #self.PM=self.DicoSMStacked["PM"] self.DicoSMStacked=DicoSMStacked self.RefFreq=self.DicoSMStacked["RefFreq"] @@ -323,7 +323,7 @@ def GiveModelImage(self,FreqIn=None,out=None): - def setListComponants(self,ListScales): + def setListComponents(self,ListScales): self.ListScales=ListScales def GiveSpectralIndexMap(self, threshold=0.1, save_dict=True): @@ -366,8 +366,8 @@ def GiveSpectralIndexMap(self, threshold=0.1, save_dict=True): # return alpha - def RemoveNegComponants(self): - print>>log, "Cleaning model dictionary from negative componants" + def RemoveNegComponents(self): + print>>log, "Cleaning model dictionary from negative components" ModelImage=self.GiveModelImage(self.DicoSMStacked["RefFreq"])[0,0] Lx,Ly=np.where(ModelImage<0) @@ -377,10 +377,10 @@ def RemoveNegComponants(self): try: del(self.DicoSMStacked["Comp"][key]) except: - print>>log, " Componant at (%i, %i) not in dict "%key + print>>log, " Component at (%i, %i) not in dict "%key - def FilterNegComponants(self,box=20,sig=3,RemoveNeg=True): - print>>log, "Cleaning model dictionary from negative componants with (box, sig) = (%i, %i)"%(box,sig) + def FilterNegComponents(self,box=20,sig=3,RemoveNeg=True): + print>>log, "Cleaning model dictionary from negative components with (box, sig) = (%i, %i)"%(box,sig) ModelImage=self.GiveModelImage(self.DicoSMStacked["RefFreq"])[0,0] Min=scipy.ndimage.filters.minimum_filter(ModelImage,(box,box)) @@ -390,7 +390,7 @@ def FilterNegComponants(self,box=20,sig=3,RemoveNeg=True): if RemoveNeg==False: Lx,Ly=np.where((ModelImage>log, " Removing neg componants too" + print>>log, " Removing neg components too" Lx,Ly=np.where( ((ModelImage>log, " Componant at (%i, %i) not in dict "%key + print>>log, " Component at (%i, %i) not in dict "%key - def CleanMaskedComponants(self,MaskName): - print>>log, "Cleaning model dictionary from masked componants using %s"%(MaskName) + def CleanMaskedComponents(self,MaskName): + print>>log, "Cleaning model dictionary from masked components using %s"%(MaskName) im=image(MaskName) MaskArray=im.getdata()[0,0].T[::-1] for (x,y) in self.DicoSMStacked["Comp"].keys(): @@ -492,7 +492,7 @@ def PutBackSubsComps(self): #RestoreDico=self.GD["Data"]["RestoreDico"] RestoreDico=DicoSolsFile["ModelName"][()][0:-4]+".DicoModel" - print>>log, "Adding previously substracted components" + print>>log, "Adding previously subtracted components" ModelMachine0=ClassModelMachine(self.GD) From 68c0f29474940d3f424b39fd432706ccd3c74eeb Mon Sep 17 00:00:00 2001 From: Martin Hardcastle Date: Mon, 26 Jun 2017 10:00:08 +0100 Subject: [PATCH 2/2] revert changes of function names, oops --- DDFacet/Imager/MORESANE/ClassModelMachineMORESANE.py | 6 +++--- DDFacet/Imager/MSMF/ClassModelMachineMSMF.py | 6 +++--- DDFacet/Imager/SSD/ClassModelMachineSSD.py | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DDFacet/Imager/MORESANE/ClassModelMachineMORESANE.py b/DDFacet/Imager/MORESANE/ClassModelMachineMORESANE.py index d38654ad..2736246e 100644 --- a/DDFacet/Imager/MORESANE/ClassModelMachineMORESANE.py +++ b/DDFacet/Imager/MORESANE/ClassModelMachineMORESANE.py @@ -230,7 +230,7 @@ def GiveModelImage(self,FreqIn=None): - def setListComponents(self,ListScales): + def setListComponants(self,ListScales): self.ListScales=ListScales @@ -258,7 +258,7 @@ def GiveSpectralIndexMap(self,CellSizeRad=1.,GaussPars=[(1,1,0)],DoConv=True): return alpha - def CleanNegComponents(self,box=20,sig=3,RemoveNeg=True): + def CleanNegComponants(self,box=20,sig=3,RemoveNeg=True): print>>log, "Cleaning model dictionary from negative components with (box, sig) = (%i, %i)"%(box,sig) ModelImage=self.GiveModelImage(self.DicoSMStacked["RefFreq"])[0,0] @@ -279,7 +279,7 @@ def CleanNegComponents(self,box=20,sig=3,RemoveNeg=True): except: print>>log, " Component at (%i, %i) not in dict "%key - def CleanMaskedComponents(self,MaskName): + def CleanMaskedComponants(self,MaskName): print>>log, "Cleaning model dictionary from masked components using %s"%(MaskName) im=image(MaskName) MaskArray=im.getdata()[0,0].T[::-1] diff --git a/DDFacet/Imager/MSMF/ClassModelMachineMSMF.py b/DDFacet/Imager/MSMF/ClassModelMachineMSMF.py index 2bd2e362..6e0ecac6 100644 --- a/DDFacet/Imager/MSMF/ClassModelMachineMSMF.py +++ b/DDFacet/Imager/MSMF/ClassModelMachineMSMF.py @@ -155,7 +155,7 @@ def AppendComponentToDictStacked(self,key,Fpol,Sols,pol_array_index=0): # entry["SolsArray"][:,pol_array_index] += Weight*SolNorm # >>>>>>> issue-255 - def setListComponents(self,ListScales): + def setListComponants(self,ListScales): self.ListScales=ListScales def GiveSpectralIndexMap(self, threshold=0.1, save_dict=True): @@ -361,7 +361,7 @@ def GiveModelImage(self,FreqIn=None,out=None,DoAbs=False): return ModelImage - def CleanNegComponents(self,box=20,sig=3,RemoveNeg=True): + def CleanNegComponants(self,box=20,sig=3,RemoveNeg=True): print>>log, "Cleaning model dictionary from negative components with (box, sig) = (%i, %i)"%(box,sig) ModelImage=self.GiveModelImage(self.DicoSMStacked["RefFreq"])[0,0] @@ -382,7 +382,7 @@ def CleanNegComponents(self,box=20,sig=3,RemoveNeg=True): except: print>>log, " Component at (%i, %i) not in dict "%key - def CleanMaskedComponents(self,MaskName): + def CleanMaskedComponants(self,MaskName): print>>log, "Cleaning model dictionary from masked components using %s"%(MaskName) im=image(MaskName) MaskArray=im.getdata()[0,0].T[::-1] diff --git a/DDFacet/Imager/SSD/ClassModelMachineSSD.py b/DDFacet/Imager/SSD/ClassModelMachineSSD.py index 1ad4a741..9dc56919 100644 --- a/DDFacet/Imager/SSD/ClassModelMachineSSD.py +++ b/DDFacet/Imager/SSD/ClassModelMachineSSD.py @@ -323,7 +323,7 @@ def GiveModelImage(self,FreqIn=None,out=None): - def setListComponents(self,ListScales): + def setListComponants(self,ListScales): self.ListScales=ListScales def GiveSpectralIndexMap(self, threshold=0.1, save_dict=True): @@ -366,7 +366,7 @@ def GiveSpectralIndexMap(self, threshold=0.1, save_dict=True): # return alpha - def RemoveNegComponents(self): + def RemoveNegComponants(self): print>>log, "Cleaning model dictionary from negative components" ModelImage=self.GiveModelImage(self.DicoSMStacked["RefFreq"])[0,0] @@ -379,7 +379,7 @@ def RemoveNegComponents(self): except: print>>log, " Component at (%i, %i) not in dict "%key - def FilterNegComponents(self,box=20,sig=3,RemoveNeg=True): + def FilterNegComponants(self,box=20,sig=3,RemoveNeg=True): print>>log, "Cleaning model dictionary from negative components with (box, sig) = (%i, %i)"%(box,sig) ModelImage=self.GiveModelImage(self.DicoSMStacked["RefFreq"])[0,0] @@ -400,7 +400,7 @@ def FilterNegComponents(self,box=20,sig=3,RemoveNeg=True): except: print>>log, " Component at (%i, %i) not in dict "%key - def CleanMaskedComponents(self,MaskName): + def CleanMaskedComponants(self,MaskName): print>>log, "Cleaning model dictionary from masked components using %s"%(MaskName) im=image(MaskName) MaskArray=im.getdata()[0,0].T[::-1]