Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
67fe0fe
aesthetics: vary num p
vivarose Dec 25, 2022
c80edf3
Merge branch 'working' into paperaesthetics
vivarose Dec 25, 2022
ff8328c
Aesthetics, resonatorsystem -3
vivarose Dec 26, 2022
63e62c4
fix
vivarose Dec 26, 2022
07d45ae
aesthetics for resonatorsystem -3
vivarose Dec 26, 2022
ae5e2ab
Use **kwargs
vivarose Dec 29, 2022
aa16f38
aesthetics: bigger datapoints in spectra
vivarose Dec 29, 2022
6b92bae
clean up: hide warnings
vivarose Dec 29, 2022
e98b956
Aesthetics: 2 frequency sweep
vivarose Dec 30, 2022
c2bd847
aesthetics: sweep 2 freq
vivarose Dec 30, 2022
96c24aa
FIX syserr
vivarose Dec 31, 2022
74f2cfa
define calc_error_interval
vivarose Jan 7, 2023
c324ddb
text_color_legend() using kwargs
vivarose Jan 7, 2023
e463983
Making figures
vivarose Jan 7, 2023
c4b8ba8
FIX
vivarose Jan 16, 2023
46ce02a
More plots
vivarose Jan 20, 2023
9cb24f8
typo
vivarose Jan 30, 2023
fc8db27
FIX
vivarose Feb 3, 2023
4412a21
BUILD: 3D-SVD heatmap
vivarose Feb 3, 2023
9c10166
BUILD: Sweep frequency: dimer
vivarose Feb 3, 2023
e7964fc
BUILD: sweep freq
vivarose Feb 3, 2023
98fa73f
BUILD: return plot_info_1D
vivarose Feb 4, 2023
cff503c
in process: zoom in on twirly plot
vivarose Feb 6, 2023
f2c5226
aesthetics: no transparency for axes
vivarose Feb 6, 2023
c966eec
aesthetics: frequencypick_dimer figure
vivarose Feb 7, 2023
8568924
BUILD: plot phase heatmap
vivarose Feb 8, 2023
faf7dd5
MAINT: Cleanup
vivarose Feb 8, 2023
839d695
BUILD: figures for varying parameters
vivarose Feb 11, 2023
afb3cd0
DOC: minor edit
vivarose Feb 21, 2023
7eb8546
MAINT: import without *
vivarose Mar 14, 2023
f11c7b7
cleanup
vivarose Mar 15, 2023
5e3faf3
Aesthetics: delta -> phi
vivarose Mar 16, 2023
c2b91e7
variable naming: set -> in
vivarose Mar 23, 2023
70d45b6
Revert "variable naming: set -> in"
vivarose Mar 23, 2023
f6bc112
pdf export preferences
vivarose Mar 23, 2023
97f8445
backup!
vivarose Apr 7, 2023
d3a2b57
cleared outputs
vivarose Apr 10, 2023
7076928
update describeresonator()
vivarose May 15, 2023
8b630cd
BUILD and FIX
vivarose May 15, 2023
13d715b
FIX
vivarose May 15, 2023
aeae091
minor edits
vivarose May 21, 2023
f5f680e
BUILD: frequency pick plots
vivarose May 26, 2023
2bf646e
FIX creating list of frequencies
vivarose May 26, 2023
8e9ed6f
FIX error if there's only one frequency
vivarose May 26, 2023
0a3198d
updating sweep 2freq and 1freq
vivarose May 27, 2023
bc58539
fix frequency peakfinding
vivarose Jun 14, 2023
3b09d5b
Minor clean up
vivarose Jun 26, 2023
7a8e7bc
Create README.md
vivarose Jan 18, 2024
c779839
DOC: rename resonatorSVDanalysis.py to NetMAP.py
vivarose Feb 17, 2024
dae6c47
Rename SVD algebraic approach.nb to NetMAP 4-mass.nb
vivarose Feb 17, 2024
75826cb
DOC: comment for resonatorsimulator.py
vivarose Feb 17, 2024
c6ab954
DOC: simulated_experiment.py
vivarose Feb 17, 2024
558e591
BUILD Initial commit by Sam
sjfeldma Mar 26, 2024
b11ded3
Merge branch 'main' of https://github.com/horowitz-lab/NetMAP
sjfeldma Mar 26, 2024
f7a9ebf
Cleaning Up NetMAP and Writing New Curve Fit Testing
lydiabull Jul 15, 2024
6a9b805
Editing some comments
lydiabull Jul 15, 2024
e8c0517
Updated Trimer_curvefit_lmfit
lydiabull Jul 15, 2024
1fe9db5
Amplitude and Phase Curve Fit for Trimer
lydiabull Jul 15, 2024
c87db4c
Adding error to data
lydiabull Jul 15, 2024
7e2dc64
Update Trimer_curvefit_mass_2
lydiabull Jul 15, 2024
553ab33
Created curve_fitting_amp_phase_all
lydiabull Jul 16, 2024
23aaf74
Created curve_fitting_X_Y_all and Modified curve_fitting_amp_phase_all
lydiabull Jul 16, 2024
1547feb
Update: Fixing bug
lydiabull Jul 16, 2024
d39eb21
Calculated Systematic Error for Multiple Curve Fitting
lydiabull Jul 17, 2024
494a2e5
Finalized Multiple Curve Fitting
lydiabull Jul 17, 2024
6ac4dc0
Update: Multiple Curve FIt
lydiabull Jul 17, 2024
aa9fce9
Update: Scaled by F for Multiple Curve Fitting
lydiabull Jul 17, 2024
32e2816
Created: Curvefit_compare_scale_vs_fix, Deleted: Incorrect multiple c…
lydiabull Jul 18, 2024
2390289
The DS_Stores that went with the last commit
lydiabull Jul 18, 2024
110ff6d
Update: Curve Fit Code
lydiabull Jul 19, 2024
94b945e
Created: comparing_curvefit_types
lydiabull Jul 19, 2024
ae93941
Created: curvefit_automated_random_pguesses
lydiabull Jul 19, 2024
15e52eb
Added a comment to resonatorstats
lydiabull Jul 19, 2024
5f6abef
Almost Final comparing_curvefit_types
lydiabull Jul 22, 2024
854c5b9
Update comparing_curvefit_types.py
lydiabull Jul 22, 2024
a1581d5
Update comparing_curvefit_types
lydiabull Jul 22, 2024
47dd043
Update comparing_curvefit_types.py
lydiabull Jul 23, 2024
4e67020
Updated comparing_curvefit_types
lydiabull Jul 23, 2024
a1f5057
Started adding NetMAP to comparing_curvefit_types
lydiabull Jul 24, 2024
4aa018b
Update comparing_curvefit_types.py
lydiabull Jul 25, 2024
a2ed185
Created trimer_case_study_frequency_picker
lydiabull Jul 29, 2024
214e970
FIX: Update name
vivarose Jul 29, 2024
bd02a71
Merge branch 'main' of https://github.com/horowitz-lab/NetMAP
vivarose Jul 29, 2024
cf0db34
FIX: monomer case
vivarose Jul 29, 2024
866b124
Creating trimer directory
lydiabull Jul 29, 2024
0c87da7
Ignore .DS_Store on mac
lydiabull Jul 29, 2024
b86e937
Copying files to work for Trimer and updating since files moved direc…
lydiabull Jul 29, 2024
ee4d2b7
Changed read_params function to work for Trimer
lydiabull Jul 29, 2024
9a9d11f
Case studies of Trimer frequency picker for NetMAP
lydiabull Jul 30, 2024
c418466
Created: trimer_frequency_study
lydiabull Jul 30, 2024
9bc039c
Completed data taking - trimer_frequency_study
lydiabull Jul 31, 2024
6804196
Can graph each iteration of the curve fit for amplitude and phase
lydiabull Oct 5, 2024
8aed0bb
Updated the graphing so y-axis is fixed
lydiabull Oct 6, 2024
6860bbb
Forgot to fix the force and now there are two example systems
lydiabull Oct 6, 2024
8a723b1
Implementing the ability to scale the residuals for amp and phase
lydiabull Oct 8, 2024
d0e55bc
Can scale the amplitude and phase by setting the "scaled" argument to…
lydiabull Oct 10, 2024
2d0e426
Attempting to do 100 systems with more trials in comparing_curvefit_t…
lydiabull Dec 5, 2024
be66801
Issue with comparing_curvefit_types fixed
lydiabull Dec 5, 2024
af58188
update name of folder to save files to
vivarose Feb 26, 2025
c207dd3
Add resonatorsystem 16: weakly coupled dimer
vivarose Feb 26, 2025
1a47c6f
Merge branch 'weakcoupling'
vivarose Feb 26, 2025
96f4a88
Merge branch 'main' of https://github.com/horowitz-lab/NetMAP
vivarose Feb 26, 2025
79196d8
MAINT: Clean up building dimer matrix in Zmatrix2resonators()
vivarose Feb 27, 2025
ee3699e
Testing Run time with different frequencies
lydiabull May 14, 2025
b101a02
Code for Number of Frequencies vs Average Run TIme
lydiabull Jun 20, 2025
e9df10c
Merge branch 'main' of https://github.com/horowitz-lab/NetMAP
lydiabull Jun 20, 2025
ab4b176
Update .gitignore
lydiabull Jun 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.DS_Store
~$*
*.xlsx
*~
myheatmap.py~
*.pyc
Expand All @@ -11,4 +14,5 @@ myheatmap.py~
*.swp
main.py
*.svg
*.png
*.png
.DS_Store
Loading