finish move of getCellEsd

Author: briantoby

GSASII/GSASIIfiles.py

@@ -2296,7 +2296,7 @@ def GetCell(self,phasenam,unique=False):
         try:
             pfx = str(phasedict['pId'])+'::'
             A,sigA = G2stIO.cellFill(pfx,phasedict['General']['SGData'],self.parmDict,self.sigDict)
-            cellSig = G2stIO.getCellEsd(pfx,phasedict['General']['SGData'],A,
+            cellSig = G2lat.getCellEsd(pfx,phasedict['General']['SGData'],A,
                 self.OverallParms['Covariance'],unique=unique)  # returns 7 vals, includes sigVol
             cellList = G2lat.A2cell(A) + (G2lat.calc_V(A),)
             return cellList,cellSig
@@ -2337,7 +2337,7 @@ def GetSeqCell(self,phasenam,data_name):
             'varyList': [Dlookup.get(striphist(v),v) for v in data_name['varyList']],
             'covMatrix': data_name['covMatrix']
             }
-        return list(G2lat.A2cell(A)) + [G2lat.calc_V(A)], G2stIO.getCellEsd(str(pId)+'::',SGdata,A,covData)
+        return list(G2lat.A2cell(A)) + [G2lat.calc_V(A)], G2lat.getCellEsd(str(pId)+'::',SGdata,A,covData)
 
     def GetAtoms(self,phasenam):
         """Gets the atoms associated with a phase. Can be used with standard

GSASII/GSASIIscriptable.py

@@ -4473,7 +4473,7 @@ def get_cell_and_esd(self):
                 sigDict.update(G2mv.ComputeDepESD(covDict['covMatrix'],covDict['varyList']))
 
             A, sigA = G2stIO.cellFill(pfx, sgdata, parmDict, sigDict)
-            cellSig = G2stIO.getCellEsd(pfx, sgdata, A, self.proj['Covariance']['data'])
+            cellSig = G2lat.getCellEsd(pfx, sgdata, A, self.proj['Covariance']['data'])
             cellList = G2lat.A2cell(A) + (G2lat.calc_V(A),)
             cellDict, cellSigDict = {}, {}
             for i, key in enumerate(['length_a', 'length_b', 'length_c',
@@ -5560,7 +5560,7 @@ def striphist(var,insChar=''):
         # convert to direct cell
         c = G2lat.A2cell(A)
         vol = G2lat.calc_V(A)
-        cE = G2stIO.getCellEsd(pfx,SGdata,A,covData)
+        cE = G2lat.getCellEsd(pfx,SGdata,A,covData)
         return list(c)+[vol],cE,uniqCellIndx
 
     def get_VaryList(self,hist):

GSASII/GSASIIseqGUI.py

@@ -1297,7 +1297,7 @@ def OnEditSelectPhaseVars(event):
                     A,zeros = G2stIO.cellFill(pfx,SGdata[pId],cellDict,zeroDict[pId])
                     c = G2lat.A2cell(A)
                     vol = G2lat.calc_V(A)
-                    cE = G2stIO.getCellEsd(pfx,SGdata[pId],A,covData)
+                    cE = G2lat.getCellEsd(pfx,SGdata[pId],A,covData)
                 except:
                     c = 6*[None]
                     cE = 6*[None]

GSASII/GSASIIstrIO.py

@@ -2172,10 +2172,6 @@ def SummRestraints(restraintDict):
             res += f'Phase {ph} Restraints: {s}'
     return res
 
-
-# getCellEsd has been moved but leave reference here for now
-getCellEsd = G2lat.getCellEsd
-
 def SetPhaseData(parmDict,sigDict,Phases,RBIds,covData,RestraintDict=None,pFile=None):
     '''Called after a refinement to transfer parameters from the parameter dict to
     the phase(s) information read from a GPX file. Also prints values to the .lst file
@@ -2458,7 +2454,7 @@ def PrintSHtextureAndSig(textureData,SHtextureSig):
         pfx = str(pId)+'::'
         if cell[0]:
             A,sigA = cellFill(pfx,SGData,parmDict,sigDict)
-            cellSig = getCellEsd(pfx,SGData,A,covData,unique=True)  #includes sigVol
+            cellSig = G2lat.getCellEsd(pfx,SGData,A,covData,unique=True)  #includes sigVol
             if pFile: pFile.write(' Reciprocal metric tensor: \n')
             ptfmt = "%15.9f"
             names = ['A11','A22','A33','A12','A13','A23']

GSASII/GSASIIstrMain.py

@@ -1418,7 +1418,7 @@ def ShowBanner(name):
         covData = DisAglData['covData']
         pfx = str(DisAglData['pId'])+'::'
         A = G2lat.cell2A(Cell[:6])
-        cellSig = G2stIO.getCellEsd(pfx,SGData,A,covData)
+        cellSig = G2lat.getCellEsd(pfx,SGData,A,covData)
         names = [' a = ',' b = ',' c = ',' alpha = ',' beta = ',' gamma = ',' Volume = ']
         valEsd = [G2mth.ValEsd(Cell[i],cellSig[i],True) for i in range(7)]
         line = '\n Unit cell:'