From f24f3df64caabf58612584199e58b1570cc2e6eb Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Tue, 23 Jul 2024 15:38:12 -0600 Subject: [PATCH 01/14] fix line length --- src/diffpy/pdfgui/gui/rseriespanel.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/diffpy/pdfgui/gui/rseriespanel.py b/src/diffpy/pdfgui/gui/rseriespanel.py index c1afe397..40c75969 100644 --- a/src/diffpy/pdfgui/gui/rseriespanel.py +++ b/src/diffpy/pdfgui/gui/rseriespanel.py @@ -32,7 +32,10 @@ def __init__(self, *args, **kwds): self.instructionsLabel = wx.StaticText( self, wx.ID_ANY, - "Select a fit from the tree on the left and set the first value, last value, \nand the step size of the maximum and/or minimum of the fit range\nbelow. If you have not set up a fit to be the template for the series, hit\ncancel and rerun this macro once a fit has been created.", + "Select a fit from the tree on the left and set the first value, last value, " + + "\nand the step size of the maximum and/or minimum of the fit range\nbelow. " + + "If you have not set up a fit to be the template for the series, hit\ncancel and " + + "rerun this macro once a fit has been created.", ) self.maxFirstLabel = wx.StaticText(self, wx.ID_ANY, "first") self.maxFirstTextCtrl = wx.TextCtrl(self, wx.ID_ANY, "") From 69a78642c1af9b0552bd3091399ac57dcf7a764b Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Tue, 23 Jul 2024 15:45:23 -0600 Subject: [PATCH 02/14] remove lambda func, import, and fix line length --- .../pdfgui/gui/temperatureseriespanel.py | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/diffpy/pdfgui/gui/temperatureseriespanel.py b/src/diffpy/pdfgui/gui/temperatureseriespanel.py index d1cc6ae1..09112bfd 100644 --- a/src/diffpy/pdfgui/gui/temperatureseriespanel.py +++ b/src/diffpy/pdfgui/gui/temperatureseriespanel.py @@ -18,7 +18,6 @@ import os.path import re -import sys import wx @@ -41,7 +40,9 @@ def __init__(self, *args, **kwds): self.instructionsLabel = wx.StaticText( self, wx.ID_ANY, - "Select a fit from the tree on the left then add datasets and assign\ntemperatues below. If you have not set up a fit to be the template\nfor the series, hit cancel and rerun this macro once a fit has been\ncreated.", + "Select a fit from the tree on the left then add datasets and assign\ntemperatues below. " + + "If you have not set up a fit to be the template\nfor the series, hit cancel and rerun this " + + "macro once a fit has been\ncreated.", ) self.instructionsLabel.SetFont( wx.Font( @@ -201,7 +202,14 @@ def onAdd(self, event): # wxGlade: TemperatureSeriesPanel. if not dir: dir = self.mainFrame.workpath - matchstring = "PDF data files (*.gr)|*.gr|PDF fit files (*.fgr)|*.fgr|PDF fit files (*.fit)|*.fit|PDF calculation files (*.cgr)|*.cgr|PDF calculation files (*.calc)|*.calc|All Files|*" + matchstring = ( + "PDF data files (*.gr)|*.gr|" + "PDF fit files (*.fgr)|*.fgr|" + "PDF fit files (*.fit)|*.fit|" + "PDF calculation files (*.cgr)|*.cgr|" + "PDF calculation files (*.calc)|*.calc|" + "All Files|*" + ) d = wx.FileDialog( None, "Choose files", @@ -293,13 +301,19 @@ def onColClick(self, event): # wxGlade: TemperatureSeriesPanel. column = event.GetColumn() # sort by temperature if column == 0: - sortkey = lambda tf: float(tf[0]) + + def sortkey(tf): + return float(tf[0]) + # sort by filename with numerical comparison of digits elif column == 1: filenames = [f for t, f in self.datasets] numericStringSort(filenames) order = dict(zip(filenames, range(len(filenames)))) - sortkey = lambda tf: order[tf[1]] + + def sortkey(tf): + return order[tf[1]] + # ignore unhandled columns else: return @@ -308,7 +322,7 @@ def onColClick(self, event): # wxGlade: TemperatureSeriesPanel. self.fillList() return - ## Utility functions + # Utility functions def fillList(self): """Fill the list with the datasets.""" self.listCtrlFiles.DeleteAllItems() @@ -325,7 +339,7 @@ def fillList(self): self.listCtrlFiles.SetItem(index, 1, shortname) return - ## Needed by mainframe + # Needed by mainframe def treeSelectionUpdate(self, node): """Set the current fit when the tree selection changes.""" nodetype = self.treeCtrlMain.GetNodeType(node) @@ -334,7 +348,7 @@ def treeSelectionUpdate(self, node): self.refresh() return - ## Required by PDFPanel + # Required by PDFPanel def refresh(self): """Block out OK button if there is no fit. From 62252fd6cdd8249b00cae4b3812da29a9e893a74 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Tue, 23 Jul 2024 15:48:54 -0600 Subject: [PATCH 03/14] remove extra # and fix not in condition --- src/diffpy/pdfgui/gui/phaseconstraintspanel.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/diffpy/pdfgui/gui/phaseconstraintspanel.py b/src/diffpy/pdfgui/gui/phaseconstraintspanel.py index 352e92ea..6282fc1d 100644 --- a/src/diffpy/pdfgui/gui/phaseconstraintspanel.py +++ b/src/diffpy/pdfgui/gui/phaseconstraintspanel.py @@ -314,7 +314,7 @@ def refresh(self): self.refreshTextCtrls() - ### update the grid ### + # update the grid ########## natoms = len(self.structure) nrows = self.gridAtoms.GetNumberRows() self.gridAtoms.BeginBatch() @@ -339,7 +339,7 @@ def refresh(self): if not m: continue barevar = m.group(1) - if not barevar in bareAtomVarColumn: + if barevar not in bareAtomVarColumn: continue column = bareAtomVarColumn[barevar] row = int(m.group(2)) - 1 @@ -348,7 +348,7 @@ def refresh(self): raise ControlValueError(emsg) self.gridAtoms.SetCellValue(row, column, con.formula) barevar = re.sub(r"\(\d+\)$", "", var) - if not barevar in bareAtomVarColumn: + if barevar not in bareAtomVarColumn: continue self.gridAtoms.AutosizeLabels() @@ -554,12 +554,12 @@ def onKey(self, event): self.mainFrame.needsSave() # Can't get these to work. Maybe later. - ## Copy - Ctrl+C / Ctrl+Insert + # Copy - Ctrl+C / Ctrl+Insert # if event.ControlDown() and (key == 67 or key == wx.WXK_INSERT): # if phasepanelutils.canCopySelectedCells(self): # phasepanelutils.copySelectedCells(self) - ## Paste - Ctrl+V / Shift+Insert + # Paste - Ctrl+V / Shift+Insert # if (event.ControlDown() and key == 86) or\ # (event.ShiftDown() and key == wx.WXK_INSERT): # if phasepanelutils.canPasteIntoCells(self): From 8c26405253b75ebd9aa30851eaec4bf543acf51b Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Tue, 23 Jul 2024 15:55:18 -0600 Subject: [PATCH 04/14] ambigious letter --- src/diffpy/pdfgui/gui/bondangledialog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diffpy/pdfgui/gui/bondangledialog.py b/src/diffpy/pdfgui/gui/bondangledialog.py index c7b05aeb..750b192e 100644 --- a/src/diffpy/pdfgui/gui/bondangledialog.py +++ b/src/diffpy/pdfgui/gui/bondangledialog.py @@ -138,8 +138,8 @@ def onSpin(self, event): loop = True while loop: loop = False - for l in letters: - if newval == getattr(self, l): + for letter in letters: + if newval == getattr(self, letter): loop = True if increasing: newval += 1 From a5f276078315b8464e0aea0f986f44e790f763fd Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Tue, 23 Jul 2024 15:57:32 -0600 Subject: [PATCH 05/14] extra #s --- src/diffpy/pdfgui/gui/sgconstraindialog.py | 2 +- src/diffpy/pdfgui/gui/sgstructuredialog.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diffpy/pdfgui/gui/sgconstraindialog.py b/src/diffpy/pdfgui/gui/sgconstraindialog.py index 1d9bb606..b4f2c0ae 100644 --- a/src/diffpy/pdfgui/gui/sgconstraindialog.py +++ b/src/diffpy/pdfgui/gui/sgconstraindialog.py @@ -204,7 +204,7 @@ def updateWidgets(self): raise ControlValueError(error) return - ### Events + # Events def onKillFocus(self, event): """Check value of widgets and update the dialog message.""" diff --git a/src/diffpy/pdfgui/gui/sgstructuredialog.py b/src/diffpy/pdfgui/gui/sgstructuredialog.py index f8a6336f..8686ccb6 100644 --- a/src/diffpy/pdfgui/gui/sgstructuredialog.py +++ b/src/diffpy/pdfgui/gui/sgstructuredialog.py @@ -195,7 +195,7 @@ def updateWidgets(self): raise ControlValueError(error) return - ### Events + # Events def onKillFocus(self, event): """Check value of widgets and update the dialog message.""" self.updateWidgets() From 60b7f86c7117834fcb7b2eb618159ad444b62c61 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Tue, 23 Jul 2024 16:03:22 -0600 Subject: [PATCH 06/14] fix bare except --- src/diffpy/pdfgui/gui/phaseconfigurepanel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py index 48bdaadd..18c24b42 100644 --- a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py +++ b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py @@ -319,7 +319,7 @@ def restrictConstrainedParameters(self): """Set 'read-only' boxes that correspond to constrained parameters.""" self.setToolTips(tooltips.phasepanel) - txtbg = self.textCtrlA.DefaultStyle.BackgroundColour + # txtbg = self.textCtrlA.DefaultStyle.BackgroundColour # First the TextCtrls for key, var in self.lConstraintsMap.items(): @@ -393,7 +393,7 @@ def applyTextCtrlChange(self, id, value): return value - except: + except ValueError: return None def applyCellChange(self, i, j, value): From f95cbfc43655e0536deabbf031b270ce2e42d130 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Tue, 23 Jul 2024 16:04:37 -0600 Subject: [PATCH 07/14] fix ambigious l --- src/diffpy/pdfgui/gui/bondlengthdialog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diffpy/pdfgui/gui/bondlengthdialog.py b/src/diffpy/pdfgui/gui/bondlengthdialog.py index e23ec5c5..7624009a 100644 --- a/src/diffpy/pdfgui/gui/bondlengthdialog.py +++ b/src/diffpy/pdfgui/gui/bondlengthdialog.py @@ -219,8 +219,8 @@ def onSpin(self, event): # wxGlade: BondLengthDialog. loop = True while loop: loop = False - for l in letters: - if newval == getattr(self, l): + for letter in letters: + if newval == getattr(self, letter): loop = True if increasing: newval += 1 From 4680567ae064165301121aa4d6bc0ce806d5dcb8 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Wed, 24 Jul 2024 12:58:19 -0600 Subject: [PATCH 08/14] imports to the top --- devutils/makesdist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devutils/makesdist b/devutils/makesdist index e77257ea..dccfaa99 100755 --- a/devutils/makesdist +++ b/devutils/makesdist @@ -11,11 +11,11 @@ import subprocess import sys import tarfile +from setup import FALLBACK_VERSION, versiondata + BASEDIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) sys.path.insert(0, BASEDIR) -from setup import FALLBACK_VERSION, versiondata - timestamp = versiondata.getint("DEFAULT", "timestamp") vfb = versiondata.get("DEFAULT", "version").split(".post")[0] + ".post0" From ee16395aca96f8ea67ce77cd5fd7b93de1ea6119 Mon Sep 17 00:00:00 2001 From: Simon Billinge Date: Thu, 25 Jul 2024 09:29:49 +0200 Subject: [PATCH 09/14] Change copyright to trigger build --- src/diffpy/pdfgui/gui/phaseconstraintspanel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/pdfgui/gui/phaseconstraintspanel.py b/src/diffpy/pdfgui/gui/phaseconstraintspanel.py index 6282fc1d..f1fad0f1 100644 --- a/src/diffpy/pdfgui/gui/phaseconstraintspanel.py +++ b/src/diffpy/pdfgui/gui/phaseconstraintspanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2025 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow, Dmitriy Bryndin From 300a5679c9300a187683c74702e093724a80fd33 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Thu, 25 Jul 2024 10:45:21 -0600 Subject: [PATCH 10/14] remove comment on txtbg var --- src/diffpy/pdfgui/gui/phaseconfigurepanel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py index 18c24b42..3bf08d72 100644 --- a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py +++ b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py @@ -319,7 +319,7 @@ def restrictConstrainedParameters(self): """Set 'read-only' boxes that correspond to constrained parameters.""" self.setToolTips(tooltips.phasepanel) - # txtbg = self.textCtrlA.DefaultStyle.BackgroundColour + self.textCtrlA.DefaultStyle.BackgroundColour # First the TextCtrls for key, var in self.lConstraintsMap.items(): From efd8ef275dc9e31fc94260967958194170b95188 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Thu, 25 Jul 2024 11:39:43 -0600 Subject: [PATCH 11/14] remove nested sortkey functions --- .../pdfgui/gui/temperatureseriespanel.py | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/diffpy/pdfgui/gui/temperatureseriespanel.py b/src/diffpy/pdfgui/gui/temperatureseriespanel.py index 09112bfd..03cf0449 100644 --- a/src/diffpy/pdfgui/gui/temperatureseriespanel.py +++ b/src/diffpy/pdfgui/gui/temperatureseriespanel.py @@ -28,6 +28,10 @@ from diffpy.pdfgui.utils import numericStringSort +def temperature_sortkey(tf): + return float(tf[0]) + + class TemperatureSeriesPanel(wx.Panel, PDFPanel): def __init__(self, *args, **kwds): PDFPanel.__init__(self) @@ -296,23 +300,25 @@ def onDelete(self, event): # wxGlade: TemperatureSeriesPanel. self.fillList() return + def create_filename_order(self): + filenames = [f for t, f in self.datasets] + numericStringSort(filenames) + self.filename_order = dict(zip(filenames, range(len(filenames)))) + return + + def filename_sortkey(self, tf): + return self.filename_order[tf[1]] + def onColClick(self, event): # wxGlade: TemperatureSeriesPanel. """Sort by temperature.""" column = event.GetColumn() # sort by temperature if column == 0: - - def sortkey(tf): - return float(tf[0]) - + sortkey = temperature_sortkey() # sort by filename with numerical comparison of digits elif column == 1: - filenames = [f for t, f in self.datasets] - numericStringSort(filenames) - order = dict(zip(filenames, range(len(filenames)))) - - def sortkey(tf): - return order[tf[1]] + self.create_filename_order() + sortkey = self.filename_sortkey() # ignore unhandled columns else: From 83435e3825cededcbbbafd5aa65faabbe7a00f4a Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Thu, 25 Jul 2024 12:29:35 -0600 Subject: [PATCH 12/14] update copyright --- src/diffpy/pdfgui/gui/bondangledialog.py | 2 +- src/diffpy/pdfgui/gui/bondlengthdialog.py | 2 +- src/diffpy/pdfgui/gui/phaseconfigurepanel.py | 2 +- src/diffpy/pdfgui/gui/phaseconstraintspanel.py | 2 +- src/diffpy/pdfgui/gui/rseriespanel.py | 2 +- src/diffpy/pdfgui/gui/sgconstraindialog.py | 2 +- src/diffpy/pdfgui/gui/sgstructuredialog.py | 2 +- src/diffpy/pdfgui/gui/temperatureseriespanel.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/diffpy/pdfgui/gui/bondangledialog.py b/src/diffpy/pdfgui/gui/bondangledialog.py index 750b192e..1191a40c 100644 --- a/src/diffpy/pdfgui/gui/bondangledialog.py +++ b/src/diffpy/pdfgui/gui/bondangledialog.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/bondlengthdialog.py b/src/diffpy/pdfgui/gui/bondlengthdialog.py index 7624009a..556f64b4 100644 --- a/src/diffpy/pdfgui/gui/bondlengthdialog.py +++ b/src/diffpy/pdfgui/gui/bondlengthdialog.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2007 trustees of the Michigan State University. +# (c) 2007-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py index 3bf08d72..bfe807d0 100644 --- a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py +++ b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow, Dmitriy Bryndin diff --git a/src/diffpy/pdfgui/gui/phaseconstraintspanel.py b/src/diffpy/pdfgui/gui/phaseconstraintspanel.py index f1fad0f1..ab3e10bb 100644 --- a/src/diffpy/pdfgui/gui/phaseconstraintspanel.py +++ b/src/diffpy/pdfgui/gui/phaseconstraintspanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006-2025 trustees of the Michigan State University. +# (c) 2006-2024-2025 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow, Dmitriy Bryndin diff --git a/src/diffpy/pdfgui/gui/rseriespanel.py b/src/diffpy/pdfgui/gui/rseriespanel.py index 40c75969..3a99ad4f 100644 --- a/src/diffpy/pdfgui/gui/rseriespanel.py +++ b/src/diffpy/pdfgui/gui/rseriespanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/sgconstraindialog.py b/src/diffpy/pdfgui/gui/sgconstraindialog.py index b4f2c0ae..79001c04 100644 --- a/src/diffpy/pdfgui/gui/sgconstraindialog.py +++ b/src/diffpy/pdfgui/gui/sgconstraindialog.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/sgstructuredialog.py b/src/diffpy/pdfgui/gui/sgstructuredialog.py index 8686ccb6..340b81d2 100644 --- a/src/diffpy/pdfgui/gui/sgstructuredialog.py +++ b/src/diffpy/pdfgui/gui/sgstructuredialog.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/temperatureseriespanel.py b/src/diffpy/pdfgui/gui/temperatureseriespanel.py index 03cf0449..04f8d438 100644 --- a/src/diffpy/pdfgui/gui/temperatureseriespanel.py +++ b/src/diffpy/pdfgui/gui/temperatureseriespanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow From 821e2fa321a25ee0ef483c68563b4f943675ff85 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Thu, 25 Jul 2024 14:39:19 -0600 Subject: [PATCH 13/14] revert copyright --- src/diffpy/pdfgui/gui/bondangledialog.py | 2 +- src/diffpy/pdfgui/gui/bondlengthdialog.py | 2 +- src/diffpy/pdfgui/gui/phaseconfigurepanel.py | 2 +- src/diffpy/pdfgui/gui/phaseconstraintspanel.py | 2 +- src/diffpy/pdfgui/gui/rseriespanel.py | 2 +- src/diffpy/pdfgui/gui/sgconstraindialog.py | 2 +- src/diffpy/pdfgui/gui/sgstructuredialog.py | 2 +- src/diffpy/pdfgui/gui/temperatureseriespanel.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/diffpy/pdfgui/gui/bondangledialog.py b/src/diffpy/pdfgui/gui/bondangledialog.py index 750b192e..1191a40c 100644 --- a/src/diffpy/pdfgui/gui/bondangledialog.py +++ b/src/diffpy/pdfgui/gui/bondangledialog.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/bondlengthdialog.py b/src/diffpy/pdfgui/gui/bondlengthdialog.py index 7624009a..556f64b4 100644 --- a/src/diffpy/pdfgui/gui/bondlengthdialog.py +++ b/src/diffpy/pdfgui/gui/bondlengthdialog.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2007 trustees of the Michigan State University. +# (c) 2007-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py index 3bf08d72..bfe807d0 100644 --- a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py +++ b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow, Dmitriy Bryndin diff --git a/src/diffpy/pdfgui/gui/phaseconstraintspanel.py b/src/diffpy/pdfgui/gui/phaseconstraintspanel.py index f1fad0f1..ab3e10bb 100644 --- a/src/diffpy/pdfgui/gui/phaseconstraintspanel.py +++ b/src/diffpy/pdfgui/gui/phaseconstraintspanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006-2025 trustees of the Michigan State University. +# (c) 2006-2024-2025 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow, Dmitriy Bryndin diff --git a/src/diffpy/pdfgui/gui/rseriespanel.py b/src/diffpy/pdfgui/gui/rseriespanel.py index 40c75969..3a99ad4f 100644 --- a/src/diffpy/pdfgui/gui/rseriespanel.py +++ b/src/diffpy/pdfgui/gui/rseriespanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/sgconstraindialog.py b/src/diffpy/pdfgui/gui/sgconstraindialog.py index b4f2c0ae..79001c04 100644 --- a/src/diffpy/pdfgui/gui/sgconstraindialog.py +++ b/src/diffpy/pdfgui/gui/sgconstraindialog.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/sgstructuredialog.py b/src/diffpy/pdfgui/gui/sgstructuredialog.py index 8686ccb6..340b81d2 100644 --- a/src/diffpy/pdfgui/gui/sgstructuredialog.py +++ b/src/diffpy/pdfgui/gui/sgstructuredialog.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/temperatureseriespanel.py b/src/diffpy/pdfgui/gui/temperatureseriespanel.py index 03cf0449..04f8d438 100644 --- a/src/diffpy/pdfgui/gui/temperatureseriespanel.py +++ b/src/diffpy/pdfgui/gui/temperatureseriespanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006 trustees of the Michigan State University. +# (c) 2006-2024 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow From da3ba3b5f123c665dcd526cb23c6e6173f398fe7 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Thu, 25 Jul 2024 15:16:33 -0600 Subject: [PATCH 14/14] reverting back to original copyright --- src/diffpy/pdfgui/gui/bondangledialog.py | 2 +- src/diffpy/pdfgui/gui/phaseconfigurepanel.py | 2 +- src/diffpy/pdfgui/gui/phaseconstraintspanel.py | 2 +- src/diffpy/pdfgui/gui/rseriespanel.py | 2 +- src/diffpy/pdfgui/gui/sgconstraindialog.py | 2 +- src/diffpy/pdfgui/gui/sgstructuredialog.py | 2 +- src/diffpy/pdfgui/gui/temperatureseriespanel.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/diffpy/pdfgui/gui/bondangledialog.py b/src/diffpy/pdfgui/gui/bondangledialog.py index 1191a40c..750b192e 100644 --- a/src/diffpy/pdfgui/gui/bondangledialog.py +++ b/src/diffpy/pdfgui/gui/bondangledialog.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006-2024 trustees of the Michigan State University. +# (c) 2006 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py index bfe807d0..3bf08d72 100644 --- a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py +++ b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006-2024 trustees of the Michigan State University. +# (c) 2006 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow, Dmitriy Bryndin diff --git a/src/diffpy/pdfgui/gui/phaseconstraintspanel.py b/src/diffpy/pdfgui/gui/phaseconstraintspanel.py index ab3e10bb..6282fc1d 100644 --- a/src/diffpy/pdfgui/gui/phaseconstraintspanel.py +++ b/src/diffpy/pdfgui/gui/phaseconstraintspanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006-2024-2025 trustees of the Michigan State University. +# (c) 2006 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow, Dmitriy Bryndin diff --git a/src/diffpy/pdfgui/gui/rseriespanel.py b/src/diffpy/pdfgui/gui/rseriespanel.py index 3a99ad4f..40c75969 100644 --- a/src/diffpy/pdfgui/gui/rseriespanel.py +++ b/src/diffpy/pdfgui/gui/rseriespanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006-2024 trustees of the Michigan State University. +# (c) 2006 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/sgconstraindialog.py b/src/diffpy/pdfgui/gui/sgconstraindialog.py index 79001c04..b4f2c0ae 100644 --- a/src/diffpy/pdfgui/gui/sgconstraindialog.py +++ b/src/diffpy/pdfgui/gui/sgconstraindialog.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006-2024 trustees of the Michigan State University. +# (c) 2006 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/sgstructuredialog.py b/src/diffpy/pdfgui/gui/sgstructuredialog.py index 340b81d2..8686ccb6 100644 --- a/src/diffpy/pdfgui/gui/sgstructuredialog.py +++ b/src/diffpy/pdfgui/gui/sgstructuredialog.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006-2024 trustees of the Michigan State University. +# (c) 2006 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow diff --git a/src/diffpy/pdfgui/gui/temperatureseriespanel.py b/src/diffpy/pdfgui/gui/temperatureseriespanel.py index 04f8d438..03cf0449 100644 --- a/src/diffpy/pdfgui/gui/temperatureseriespanel.py +++ b/src/diffpy/pdfgui/gui/temperatureseriespanel.py @@ -4,7 +4,7 @@ # # PDFgui by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2006-2024 trustees of the Michigan State University. +# (c) 2006 trustees of the Michigan State University. # All rights reserved. # # File coded by: Chris Farrow