get_setup fixed to use the passed setup name + typos

.gitignore

@@ -109,7 +109,5 @@ pyEPR/.pylintrc
 *.aedtresults/*
 *.aedtresults*
 pyEPR/core.py.rej
-pyEPR/core.py.rej
-pyEPR/core.py.rej
 .vscode/
-.idea/
+.idea/

pyEPR/ansys.py

@@ -255,19 +255,19 @@ def _add_release_fn(fn):
 
 def release():
     '''
-    Release COM connection to HFSS.
+    Release COM connection to Ansys.
     '''
     global _release_fns
     for fn in _release_fns:
         fn()
     time.sleep(0.1)
 
-    # Note that _GetInterfaceCount is a memeber
+    # Note that _GetInterfaceCount is a member
     refcount = pythoncom._GetInterfaceCount()  # pylint: disable=no-member
 
     if refcount > 0:
         print("Warning! %d COM references still alive" % (refcount))
-        print("HFSS will likely refuse to shut down")
+        print("Ansys will likely refuse to shut down")
 
 
 class COMWrapper(object):
@@ -403,7 +403,8 @@ def close_all_windows(self):
         self._desktop.CloseAllWindows()
 
     def project_count(self):
-        return self._desktop.Count()
+        count = len(self._desktop.GetProjects())
+        return count
 
     def get_active_project(self):
         return HfssProject(self, self._desktop.GetActiveProject())
@@ -1080,17 +1081,12 @@ def insert_sweep(self,
         name = increment_name(name, self.get_sweep_names())
         params = [
             "NAME:" + name,
-            "IsEnabled:=",
-            True,
-            "Type:=",
-            type,
-            "SaveFields:=",
-            save_fields,
-            "SaveRadFields:=",
-            False,
+            "IsEnabled:=",     True,
+            "Type:=",          type,
+            "SaveFields:=",    save_fields,
+            "SaveRadFields:=", False,
             # "GenerateFieldsForAllFreqs:="
-            "ExtrapToDC:=",
-            False,
+            "ExtrapToDC:=",    False,
         ]
 
         # not sure hwen extacyl this changed between 2016 and 2019
@@ -1404,6 +1400,11 @@ def get_matrix(
         # <FileName>, <SolnType>, <DesignVariationKey>, <Solution>, <Matrix>, <ResUnit>,
         # <IndUnit>, <CapUnit>, <CondUnit>, <Frequency>, <MatrixType>, <PassNumber>,
         # <ACPlusDCResistance>
+        logger.info(f'Exporting matrix data to ({path}, {soln_type}, {variation}, '
+                                             f'{self.name}:{solution_kind}, '
+                                             '"Original", "ohm", "nH", "fF", '
+                                             f'"mSie", {frequency}, {MatrixType}, '
+                                             f'{pass_number}, {ACPlusDCResistance}')
         self.parent._design.ExportMatrixData(path, soln_type, variation,
                                              f'{self.name}:{solution_kind}',
                                              "Original", "ohm", "nH", "fF",

pyEPR/project_info.py

@@ -357,7 +357,7 @@ def connect(self):
 
         if self.project and self.design:
             logger.info(
-                '\tConnection to Ansys established successfully. \N{grinning face} \n'
+                f'\tConnected to project \"{self.project_name}\" and design \"{self.design_name}\" \N{grinning face} \n'
             )
 
         if not self.project:
@@ -367,7 +367,7 @@ def connect(self):
 
         if not self.design:
             logger.info(
-                '\t Design not detected in project. Is there a design in your project? \N{thinking face} \n'
+                f'\t Connected to project \"{self.project_name}\". No design detected'
             )
 
         return self
@@ -385,16 +385,15 @@ def get_setup(self, name: str):
         """
         if name is None:
             return None
-        else:
-            self.setup = self.design.get_setup(name=self.setup_name if not name else name)
-            if self.setup is None:
-                logger.error(f"Could not retrieve setup: {self.setup_name}\n \
-                               Did you give the right name? Does it exist?")
+        self.setup = self.design.get_setup(name=name)
+        if self.setup is None:
+            logger.error(f"Could not retrieve setup: {name}\n \
+                        Did you give the right name? Does it exist?")
 
-            self.setup_name = self.setup.name
-            logger.info(
-                f'\tOpened setup `{self.setup_name}`  ({type(self.setup)})')
-            return self.setup
+        self.setup_name = self.setup.name
+        logger.info(
+            f'\tOpened setup `{self.setup_name}`  ({type(self.setup)})')
+        return self.setup
 
     def check_connected(self):
         """
@@ -409,7 +408,7 @@ def check_connected(self):
 
     def disconnect(self):
         '''
-        Disconnect from existing HFSS design.
+        Disconnect from existing Ansys Desktop API.
         '''
         assert self.check_connected() is True,\
             "It does not appear that you have connected to HFSS yet.\