Fixing equation and cleanup

example_notebook.ipynb

@@ -6,12 +6,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import jepl.jepl as jmk # import the module. If this file is located further up the file tree it may look like \"resources.JEPL.jepl.jepl\"\n",
-<<<<<<< HEAD
-    "#%run jepl/jeplinit.py jepl/ # This is needed to initialize the databases. Again if you are running this from a different location the run command will look like %run jeplinit.py resources/JEPL/jepl/ "
-=======
-    "%run jepl/jeplinit.py jepl/ # This is needed to initilize the databases. Again if you are running this from a different location the run command will look like %run jeplinit.py resources/JEPL/jepl/ "
->>>>>>> 619a53650e4a613fb57eade5024967e76c5a0bd7
    ]
   },
   {
@@ -791,7 +785,6 @@
        "33"
       ]
      },
-<<<<<<< HEAD
      "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result"
@@ -915,15 +908,6 @@
    "source": [
     "from jepl.jepl_templates import *\n",
     "af_labels('testresults_labels.csv')"
-=======
-     "execution_count": 17,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "jmk.panels_per_string(1500,40,beta=-0.5,temp = 2)"
->>>>>>> 619a53650e4a613fb57eade5024967e76c5a0bd7
    ]
   }
  ],

jepl/jepl_general.py

@@ -18,7 +18,7 @@ def va(voltage, current,phases=3):
     '''
 
     if phases == 3:
-        va = (math.pi * voltage * current)
+        va = (math.sqrt(3) * voltage * current)
     
     elif phases == 1:
         vs = voltage * current