tests passing checkpoint 2

Author: cadenmyers13

src/diffpy/cmipdf/basepdfgenerator.py

@@ -304,7 +304,7 @@ def set_structure_from_parset(self, parset, periodic=True):
         """
         # Store the ParameterSet for easy access
         self._phase = parset
-        self.structure = self._phase.structure
+        self.structure = self._phase.stru
 
         # Put this ParameterSet in the ProfileGenerator.
         self.add_parameter_set(parset)

src/diffpy/cmipdf/pdfcontribution.py

@@ -196,11 +196,11 @@ def addStructure(self, name, structure, periodic=True):
         """
         # Based on periodic, create the proper generator.
         if periodic:
-            from diffpy.srfit.pdf.pdfgenerator import PDFGenerator
+            from diffpy.cmipdf.pdfgenerator import PDFGenerator
 
             gen = PDFGenerator(name)
         else:
-            from diffpy.srfit.pdf.debyepdfgenerator import DebyePDFGenerator
+            from diffpy.cmipdf.debyepdfgenerator import DebyePDFGenerator
 
             gen = DebyePDFGenerator(name)
 
@@ -241,11 +241,11 @@ def addPhase(self, name, parset, periodic=True):
         """
         # Based on periodic, create the proper generator.
         if periodic:
-            from diffpy.srfit.pdf.pdfgenerator import PDFGenerator
+            from diffpy.cmipdf.pdfgenerator import PDFGenerator
 
             gen = PDFGenerator(name)
         else:
-            from diffpy.srfit.pdf.debyepdfgenerator import DebyePDFGenerator
+            from diffpy.cmipdf.debyepdfgenerator import DebyePDFGenerator
 
             gen = DebyePDFGenerator(name)