Changeset 2152 for trunk/exports/G2export_pwdr.py

Timestamp:

Feb 18, 2016 1:01:27 PM (7 years ago)

Author:

vondreele

Message:

all PWDR exporters will make file name from histogram name
allow read of multibank data
alert user to duplicate histograms (by name)
rename data will not change Bank or Azm part of histogram name
fix L&R plotting commands for TOF data

File:

• trunk/exports/G2export_pwdr.py (modified) (2 diffs)

trunk/exports/G2export_pwdr.py

@@ -97 +97 @@
         filenamelist = []
         for hist in self.histnam:
-            if len(self.histnam) > 1:
-                # multiple files: create a unique name from the histogram
-                fileroot = G2obj.MakeUniqueLabel(self.MakePWDRfilename(hist),filenamelist)
-                # create an instrument parameter file
-                self.filename = os.path.join(self.dirname,fileroot + self.extension)
-            else:
-                # use the supplied name, but force the extension
-                self.filename= os.path.splitext(self.filename)[0] + self.extension
-
+            # multiple files: create a unique name from the histogram
+            fileroot = G2obj.MakeUniqueLabel(self.MakePWDRfilename(hist),filenamelist)
+            # create an instrument parameter file
+            self.filename = os.path.join(self.dirname,fileroot + self.extension)
             histblk = self.Histograms[hist]
             prmname = self.WriteInstFile(hist,histblk['Instrument Parameters'][0])
             self.Writer(hist,prmname=prmname)
             print('Histogram '+str(hist)+' written to file '+str(self.fullpath))
-
 
 class ExportPowderXYE(G2IO.ExportBaseclass):
@@ -157 +151 @@
         filenamelist = []
         for hist in self.histnam:
-            if len(self.histnam) > 1:
-                # multiple files: create a unique name from the histogram
-                fileroot = G2obj.MakeUniqueLabel(self.MakePWDRfilename(hist),filenamelist)
-                # create an instrument parameter file
-                self.filename = os.path.join(self.dirname,fileroot + self.extension)
-            else:
-                # use the supplied name, but force the extension
-                self.filename= os.path.splitext(self.filename)[0] + self.extension
-
+            # multiple files: create a unique name from the histogram
+            fileroot = G2obj.MakeUniqueLabel(self.MakePWDRfilename(hist),filenamelist)
+            # create an instrument parameter file
+            self.filename = os.path.join(self.dirname,fileroot + self.extension)
             self.Writer(hist)
             print('Histogram '+str(hist)+' written to file '+str(self.fullpath))