add sample material column and rewrite inosticID column

README.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Qubit Tool
 
 Read Qubit CSV dump.
@@ -6,12 +5,3 @@ Read Qubit CSV dump.
 Search dump for matching data and include in output.
 
 Format Output and add to Excel Document Output Tab.
-=======
-Qubit Tool
-
-Read Qubit CSV dump.
-
-Search dump for matching data and include in output.
-
-Format Output and add to Excel Document Output Tab.
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a

pyproject.toml

@@ -1,8 +1,3 @@
-<<<<<<< HEAD
 [build-system]
 requires = ["setuptools"]
-=======
-[build-system]
-requires = ["setuptools"]
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
 build-backend = "setuptools.build_meta"

qubittool/rowmodel.py

@@ -4,10 +4,7 @@ class RowModel:
         self.coordinate = coordinate
         self.accessionid = accessionid
         self.customerid = None
-<<<<<<< HEAD
         self.materialid = None
-=======
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
         self.plasmavolml = float(0.0)
         self.qubitrunid = None
         self.qubitassay = None

qubittool/tool.py

@@ -91,12 +91,8 @@ def write_run_doc(dm:dict, path:str):
     for r in dm:
         model:RowModel = dm[r]
         ix=ix+1
-<<<<<<< HEAD
         fmtId = formatInosticsId( model.get_Id(), model.get_materialid() )
         ws.append([ix, "", fmtId, model.get_customerid(), model.get_plasmavolml(), model.get_qubitrunid(), 
-=======
-        ws.append([ix, "", model.get_Id(), model.get_customerid(), model.get_plasmavolml(), model.get_qubitrunid(), 
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
         model.get_sampleconc(), convert_to_GE(model.get_sampleconc())])
 
     grayFill = PatternFill(start_color='D0CECE', end_color='D0CECE',

setup.cfg

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 [metadata]
 name = qubittool
 version = 0.1.0
@@ -13,20 +12,4 @@ install_requires =
     pandas
 
 [options.package_data]
-=======
-[metadata]
-name = qubittool
-version = 0.1.0
-
-[options]
-packages = find:
-zip_safe = True
-include_package_data = True
-install_requires = 
-    PySimpleGUI >= 4.60
-    openpyxl >= 3.1
-    pandas
-
-[options.package_data]
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
 * = README.md