ADU minor changes

hp4155/ADU/ADU_version_2.py

@@ -16,26 +16,33 @@ sample = information_box_new()
 
 ###end of sampling information#######################################
 test_contacts=widgets.Checkbox(description = "Test of the Contacts",value = True,indent = False)
-display(test_contacts)
+#display(test_contacts)
+#print()
+
+# move checkboxes outside of the tabs
+transfer_check,integration_transfer = header('Transfer Curve')
+output_check,integration_output = header('Output Curve')
+gatediode_check,integration_gatediode=header('Gatediode')
+
+checkboxes = widgets.HBox([test_contacts,transfer_check,output_check,gatediode_check])
+display(checkboxes)
 print()
 
+
 #transfer
-transfer_check,integration_transfer = header('Transfer Curve')
 Vds_transfer_widgets,Vds_transfer = secondary('Vds',0.1,0.45,1,0.1)
 Vgs_transfer_widgets,Vgs_transfer = primary('Vgs',2,-0.05,-8,0.01)
-transfer_box = widgets.VBox([widgets.HBox([transfer_check,integration_transfer]),Vds_transfer_widgets,Vgs_transfer_widgets])
+transfer_box = widgets.VBox([integration_transfer,Vds_transfer_widgets,Vgs_transfer_widgets])
 
 
 #output
-output_check,integration_output = header('Output Curve')
 Vds_output_widgets,Vds_output = primary('Vds',0,0.1,15,0.1)
 Vgs_output_widgets,Vgs_output = secondary('Vgs',2,-1,-8,0.01)
-output_box = widgets.VBox([widgets.HBox([output_check,integration_output]),Vds_output_widgets,Vgs_output_widgets])
+output_box = widgets.VBox([integration_output,Vds_output_widgets,Vgs_output_widgets])
 
 #GateDiodde
-gatediode_check,integration_gatediode=header('Gatediode')
 Vgs_gatediode_widgets,Vgs_gatediode=primary('Vgs',-8,0.05,2,0.02)
-gatediode_box = widgets.VBox([widgets.HBox([gatediode_check,integration_gatediode]),Vgs_gatediode_widgets])
+gatediode_box = widgets.VBox([integration_gatediode,Vgs_gatediode_widgets])
 
 #the tab widget
 children = [transfer_box,output_box,gatediode_box]
@@ -143,7 +150,7 @@ def on_start_clicked(b):
                 df = pd.DataFrame(data)
 
                 #write to file
-                filename = f"{sample['sample'].value}_{sample['field'].value}_{sample['device'].value}U.txt"
+                filename = f"{sample['sample'].value}_{sample['field'].value}_{sample['device'].value}_U.txt"
                 file = create_file(filename)
                 save_to_file('Transfer Curve',file,df,sample,integration_transfer,Vgs_transfer,Vds_transfer)
             
@@ -208,7 +215,7 @@ def on_start_clicked(b):
                 df = pd.DataFrame(data)
 
                 #write to file
-                filename = f"{sample['sample'].value}_{sample['field'].value}_{sample['device'].value}A.txt"
+                filename = f"{sample['sample'].value}_{sample['field'].value}_{sample['device'].value}_A.txt"
                 file = create_file(filename)
                 save_to_file('Output Curve',file,df,sample,integration_output,Vgs_output,Vds_output)
 
@@ -252,7 +259,7 @@ def on_start_clicked(b):
                 data = {header[0]:Vgs,header[1]:Igmm,header[2]:ABSIgmm,header[3]:Ig}
                 df = pd.DataFrame(data)
 
-                filename =f"{sample['sample'].value}_{sample['field'].value}_{sample['device'].value}D.txt"
+                filename =f"{sample['sample'].value}_{sample['field'].value}_{sample['device'].value}_D.txt"
                 file = create_file(filename)
                 save_to_file('Gatediode',file,df,sample,integration_gatediode,Vgs_gatediode)
 

hp4155/ADU/lib/interface_version_2.py

@@ -8,15 +8,12 @@ height = 'auto'
 style = {'description_width': 'initial'}
 floatbox_width = "80%"
 def header(name):
-    header_grid = GridspecLayout(1,3)
     style = {'description_width': 'initial'}
     options_integration=["SHORt","MEDium","LONG"]
 
-    header_grid[0,0]=widgets.Checkbox(description = name,value = True,indent = False)
-    header_grid[0,2] = widgets.Dropdown(layout=Layout(height='auto', width='auto'),options=options_integration,value="MEDium",description='Integration Time',style =style)#integration time
+    check=widgets.Checkbox(description = name,value = True,indent = False)
+    integration= widgets.Dropdown(options=options_integration,value="MEDium",description='Integration Time',style =style,layout=Layout(height='auto', width="30%"))#integration time
     
-    check = header_grid[0,0]
-    integration = header_grid[0,2]
     return check, integration
 
 

hp4155/ADU/new_interface_test.ipynb

@@ -9,7 +9,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "ee008b14bb7548d49483304f6a6463df",
+       "model_id": "be6f6052612047bdaa3cc713a3c37152",
        "version_major": 2,
        "version_minor": 0
       },
@@ -23,7 +23,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "c082a96354644b6f929dece07cf459bc",
+       "model_id": "72477ea5b2b9472cacd1f9f1ed13218c",
        "version_major": 2,
        "version_minor": 0
       },
@@ -44,12 +44,12 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "f08d4966680041f8ae0838bed938a322",
+       "model_id": "9fe1d167f2bb44d9930b68b51d427763",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "Checkbox(value=True, description='Test of the Contacts', indent=False)"
+       "HBox(children=(Checkbox(value=True, description='Test of the Contacts', indent=False), Checkbox(value=True, de…"
       ]
      },
      "metadata": {},
@@ -65,12 +65,12 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "9062b04231dc462b9a6501ebf786c253",
+       "model_id": "3f674de1277a458e828bac839a8f2153",
        "version_major": 2,
        "version_minor": 0
       },
       "text/plain": [
-       "Tab(children=(VBox(children=(HBox(children=(Checkbox(value=True, description='Transfer Curve', indent=False, l…"
+       "Tab(children=(VBox(children=(Dropdown(description='Integration Time', index=1, layout=Layout(height='auto', wi…"
       ]
      },
      "metadata": {},
@@ -82,34 +82,6 @@
      "text": [
       "\n"
      ]
-    },
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "bc1de6df2b6d496a8ce2d838e1242b63",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "HBox(children=(Button(description='Start Measurement', style=ButtonStyle()), Button(description='Import from i…"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "86a04e5e0e8b46159240d1b745fbefc0",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "Output()"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
     }
    ],
    "source": [
@@ -121,7 +93,6 @@
     "from interface_version_2 import *\n",
     "from help import *\n",
     "\n",
-    "\n",
     "# Create the grids\n",
     "#create the information grid\n",
     "style = {'description_width': 'initial'}\n",
@@ -129,26 +100,33 @@
     "\n",
     "###end of sampling information#######################################\n",
     "test_contacts=widgets.Checkbox(description = \"Test of the Contacts\",value = True,indent = False)\n",
-    "display(test_contacts)\n",
+    "#display(test_contacts)\n",
+    "#print()\n",
+    "\n",
+    "# move checkboxes outside of the tabs\n",
+    "transfer_check,integration_transfer = header('Transfer Curve')\n",
+    "output_check,integration_output = header('Output Curve')\n",
+    "gatediode_check,integration_gatediode=header('Gatediode')\n",
+    "\n",
+    "checkboxes = widgets.HBox([test_contacts,transfer_check,output_check,gatediode_check])\n",
+    "display(checkboxes)\n",
     "print()\n",
     "\n",
+    "\n",
     "#transfer\n",
-    "transfer_check,integration_transfer = header('Transfer Curve')\n",
     "Vds_transfer_widgets,Vds_transfer = secondary('Vds',0.1,0.45,1,0.1)\n",
     "Vgs_transfer_widgets,Vgs_transfer = primary('Vgs',2,-0.05,-8,0.01)\n",
-    "transfer_box = widgets.VBox([widgets.HBox([transfer_check,integration_transfer]),Vds_transfer_widgets,Vgs_transfer_widgets])\n",
+    "transfer_box = widgets.VBox([integration_transfer,Vds_transfer_widgets,Vgs_transfer_widgets])\n",
     "\n",
     "\n",
     "#output\n",
-    "output_check,integration_output = header('Output Curve')\n",
     "Vds_output_widgets,Vds_output = primary('Vds',0,0.1,15,0.1)\n",
     "Vgs_output_widgets,Vgs_output = secondary('Vgs',2,-1,-8,0.01)\n",
-    "output_box = widgets.VBox([widgets.HBox([output_check,integration_output]),Vds_output_widgets,Vgs_output_widgets])\n",
+    "output_box = widgets.VBox([integration_output,Vds_output_widgets,Vgs_output_widgets])\n",
     "\n",
     "#GateDiodde\n",
-    "gatediode_check,integration_gatediode=header('Gatediode')\n",
     "Vgs_gatediode_widgets,Vgs_gatediode=primary('Vgs',-8,0.05,2,0.02)\n",
-    "gatediode_box = widgets.VBox([widgets.HBox([gatediode_check,integration_gatediode]),Vgs_gatediode_widgets])\n",
+    "gatediode_box = widgets.VBox([integration_gatediode,Vgs_gatediode_widgets])\n",
     "\n",
     "#the tab widget\n",
     "children = [transfer_box,output_box,gatediode_box]\n",
@@ -158,32 +136,13 @@
     "tab.titles = titles\n",
     "\n",
     "display(tab)\n",
-    "print()\n",
-    "\n",
-    "# the button\n",
-    "button = widgets.Button(description ='Start Measurement')\n",
-    "output = widgets.Output()\n",
-    "\n",
-    "export_ini_button = widgets.Button(description = 'Export as ini')\n",
-    "import_ini_button = widgets.Button(description='Import from ini')\n",
-    "\n",
-    "all_widgets =[button,transfer_check,integration_transfer,output_check,integration_output,gatediode_check,integration_gatediode,test_contacts,export_ini_button,import_ini_button]\n",
-    "\n",
-    "add_widgets_to_list(sample,all_widgets)\n",
-    "add_widgets_to_list(Vds_transfer,all_widgets)\n",
-    "add_widgets_to_list(Vgs_transfer,all_widgets)\n",
-    "add_widgets_to_list(Vds_output,all_widgets)\n",
-    "add_widgets_to_list(Vgs_output,all_widgets)\n",
-    "add_widgets_to_list(Vgs_gatediode,all_widgets)\n",
-    "\n",
-    "line = widgets.HBox([button,import_ini_button,export_ini_button])\n",
-    "display(line,output)"
+    "print()"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "5a262dfd-d6d8-442d-9fa8-30afe04b7c6e",
+   "id": "b280f97b-ab06-4688-a8ac-b8807d962a33",
    "metadata": {},
    "outputs": [],
    "source": []
@@ -205,7 +164,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.12.0"
   }
  },
  "nbformat": 4,