CaltechPrecisionTiming · esmeknabe · Aug 5, 2021 · Aug 29, 2021
diff --git a/BK_PS/Thermal_PSControl.py b/BK_PS/Thermal_PSControl.py
@@ -44,18 +44,29 @@ def SetVoltage(Resource, ChVoltage, safetyCheck=False):
     else:
         print ('[WARNING] : The voltage is out of the bounds [0-2V], not changing the low voltage supply output')
 
-def ChRead(Resource, safetyCheck=True):
+ddef ChRead(Resource, safetyCheck=True):
     Resource.write('*IDN?')
     idn = Resource.read()
 
     V = float(Resource.query('MEASure:VOLTage:DC?'))
     I = float(Resource.query('MEASure:CURRent:DC?'))
     print("Current",I)
     print("Voltage",V)
-    P = V*I
+
+    # open-pin prototype resistance correction values
+    #R_s = 1.7
+    #R_wires = 0.19
+
+    # flex-cable prototype resistance correction values
+    #R_s = 0.286
+    R_wires = 0.19
+
+
+    V_s = V - (R_wires * I)
+    P = V_s*I
     print("Power",P)
     return V, I, P
-    
+
 def DisableLVOutput(Resource):
     Resource.write("outp off")
     #Resource.read()

diff --git a/BK_PS/test_backup_070221.py b/BK_PS/test_backup_070221.py
diff --git a/SiPM_Heating/.ipynb_checkpoints/thermistor_temp_plots-checkpoint.ipynb b/SiPM_Heating/.ipynb_checkpoints/thermistor_temp_plots-checkpoint.ipynb
diff --git a/SiPM_Heating/CSVDatasets/210805103000_210805114000.csv b/SiPM_Heating/CSVDatasets/210805103000_210805114000.csv
diff --git a/SiPM_Heating/CSVDatasets/210805160730_210805170900.csv b/SiPM_Heating/CSVDatasets/210805160730_210805170900.csv
diff --git a/SiPM_Heating/CSVDatasets/210805180100_210805223000.csv b/SiPM_Heating/CSVDatasets/210805180100_210805223000.csv
diff --git a/SiPM_Heating/CSVDatasets/210806102600_210806104900.csv b/SiPM_Heating/CSVDatasets/210806102600_210806104900.csv
diff --git a/SiPM_Heating/CSVDatasets/210808080000_210809080000.csv b/SiPM_Heating/CSVDatasets/210808080000_210809080000.csv
diff --git a/SiPM_Heating/CSVDatasets/210809060000_210809080000.csv b/SiPM_Heating/CSVDatasets/210809060000_210809080000.csv
diff --git a/SiPM_Heating/CSVDatasets/210809082600_210809103000.csv b/SiPM_Heating/CSVDatasets/210809082600_210809103000.csv
diff --git a/SiPM_Heating/CSVDatasets/210811000000_210811084000.csv b/SiPM_Heating/CSVDatasets/210811000000_210811084000.csv
diff --git a/SiPM_Heating/CSVDatasets/210811080000_210811084000.csv b/SiPM_Heating/CSVDatasets/210811080000_210811084000.csv
diff --git a/SiPM_Heating/CSVDatasets/210811090000_210811120200.csv b/SiPM_Heating/CSVDatasets/210811090000_210811120200.csv
diff --git a/SiPM_Heating/CSVDatasets/210811090000_210811124000.csv b/SiPM_Heating/CSVDatasets/210811090000_210811124000.csv
diff --git a/SiPM_Heating/CSVDatasets/210811170000_210811181200.csv b/SiPM_Heating/CSVDatasets/210811170000_210811181200.csv
diff --git a/SiPM_Heating/CSVDatasets/210811190000_210811200500.csv b/SiPM_Heating/CSVDatasets/210811190000_210811200500.csv
diff --git a/SiPM_Heating/CSVDatasets/210811194000_210811201500.csv b/SiPM_Heating/CSVDatasets/210811194000_210811201500.csv
diff --git a/SiPM_Heating/CSVDatasets/210811194000_210812102000.csv b/SiPM_Heating/CSVDatasets/210811194000_210812102000.csv
diff --git a/SiPM_Heating/CSVDatasets/210812164000_210812184700.csv b/SiPM_Heating/CSVDatasets/210812164000_210812184700.csv
diff --git a/SiPM_Heating/CSVDatasets/210813000000_210813113000.csv b/SiPM_Heating/CSVDatasets/210813000000_210813113000.csv
diff --git a/SiPM_Heating/CSVDatasets/210816121500_210816171000.csv b/SiPM_Heating/CSVDatasets/210816121500_210816171000.csv
diff --git a/SiPM_Heating/CSVDatasets/210817120000_210817144400.csv b/SiPM_Heating/CSVDatasets/210817120000_210817144400.csv
diff --git a/SiPM_Heating/CSVDatasets/210817120000_210817150000.csv b/SiPM_Heating/CSVDatasets/210817120000_210817150000.csv
diff --git a/SiPM_Heating/CSVDatasets/210817170000_210817210000.csv b/SiPM_Heating/CSVDatasets/210817170000_210817210000.csv
diff --git a/SiPM_Heating/CSVDatasets/210817170000_210817221800.csv b/SiPM_Heating/CSVDatasets/210817170000_210817221800.csv
diff --git a/SiPM_Heating/CSVDatasets/210818120000_210818154500.csv b/SiPM_Heating/CSVDatasets/210818120000_210818154500.csv
diff --git a/SiPM_Heating/CSVDatasets/210818140000_210818160000.csv b/SiPM_Heating/CSVDatasets/210818140000_210818160000.csv
diff --git a/SiPM_Heating/CSVDatasets/210819000000_210819103400.csv b/SiPM_Heating/CSVDatasets/210819000000_210819103400.csv
diff --git a/SiPM_Heating/CSVDatasets/210819110000_210819113500.csv b/SiPM_Heating/CSVDatasets/210819110000_210819113500.csv
diff --git a/SiPM_Heating/CSVDatasets/210819130000_210819155000.csv b/SiPM_Heating/CSVDatasets/210819130000_210819155000.csv
diff --git a/SiPM_Heating/CSVDatasets/210819140000_210819160000.csv b/SiPM_Heating/CSVDatasets/210819140000_210819160000.csv
diff --git a/SiPM_Heating/CSVDatasets/210819160000_210819172000.csv b/SiPM_Heating/CSVDatasets/210819160000_210819172000.csv
diff --git a/SiPM_Heating/CSVDatasets/210819180000_210820104400.csv b/SiPM_Heating/CSVDatasets/210819180000_210820104400.csv
diff --git a/SiPM_Heating/CSVDatasets/210819180000_210820105200.csv b/SiPM_Heating/CSVDatasets/210819180000_210820105200.csv
diff --git a/SiPM_Heating/README.md b/SiPM_Heating/README.md
@@ -2,34 +2,15 @@
 
 ## Purpose:
 - Analysis of data collected via thermistors of the heating gradient of the SIPM module. Heat was generated by running 1.04 W of power through each side of the SIPM module in order to model the predicted dark current production within the detector itself.
-- Some of these files are left over from previous studies, but thermistor_temp_plots is relevant to the current setup.
 
 ## Description of included files:
 
-**steady_state.py**
-- Uses thermistor data from csv files to calculate their steady state temperatures, their standard deviation of these, the error as calculated from the calibration parameters.
--Takes csv file name and number of thermistors as command line input. If end of valid data beyond end of recorded data, add this end time into your commmand line arguments.  If believes valid data ends before it should, add a start time to your command line arguments.
-Use for: Calculating steady state temperature, compare these between runs.
-
-**thermistors_time.py**
-- Uses variables to convert th data in csv files to arrays
-- Fills array one by one, not in loop good for when the thermistors are not neccesarily in a continues order
-Use for: plotting the thermistors versus the time. Can also plot the gradient across the plate.
-
-
-**thermistors_timeerr.py**
-- Stores data in csv files into dictionaries, this lend for a very clean code
-- This only works for when you know the labels of the thermistors are correct and correpond to the column
-they are placed into. This is because the code runs a loop to fill the dictionary
-Use for: plotting thermistors versus time with errors
-
-
-**compare.py**
-- Imports two different thermistors_time.py scripts and plots comparisons of them
-USe for: comparing the curves for with ceramics against those without
-
 **thermistor_temp_plots**
 - Accepts raw csv datasets from the raspberry pi and converts the ADC values into temperature plots
-- Contains a basic normalization function and running average function
+- Contains a basic normalization function accurate for the current iteration of the box
+- Includes running average plotting, as well as returning the average value of a single thermistor over a set period of time
 Use for: plotting thermistor temperature readings versus time
 
+**CSV_Datasets**
+- A folder to contain all raw .csv files retrieved from the SQL database using Data2Csv.py. 
+
diff --git a/SiPM_Heating/thermistor_temp_plots.ipynb b/SiPM_Heating/thermistor_temp_plots.ipynb