Enh/m av2 #455
Closed
Enh/m av2 #455
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@tstavenga I see that the last change you added broke the tests, might be worth checking out why that is. I also see that this PR essentially contains two big changes.
I would propose the following
Let me know if I can be of any help. |
Aypac
approved these changes
Apr 13, 2018
Aypac
reviewed
Apr 13, 2018
pycqed/analysis_v2/base_analysis.py
Outdated
| @@ -288,6 +296,22 @@ def extract_data(self): | |||
| self.raw_data_dict = new_dict | |||
| self.raw_data_dict['timestamp'] = self.timestamps[0] | |||
| self.raw_data_dict['timestamps'] = self.timestamps | |||
|
|
|||
| def extract_data_json(self): | |||
There was a problem hiding this comment.
this block seems to be misplaced?
Aypac
reviewed
Apr 13, 2018
pycqed/analysis_v2/base_analysis.py
Outdated
| @@ -461,38 +488,31 @@ def save_fit_results(self): | |||
| """ | |||
| Saves the fit results | |||
| """ | |||
|
|
|||
There was a problem hiding this comment.
This is a bugfix and needs to be merged over
use numpy array for transpose
Aypac
added a commit
that referenced
this pull request
Apr 13, 2018
Aypac
added a commit
that referenced
this pull request
Apr 13, 2018
|
This is not working. Created a new branch #458 to realize this request. |
Aypac
added a commit
that referenced
this pull request
Apr 13, 2018
Aypac
added a commit
that referenced
this pull request
Apr 13, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please use the following template for a pull request.
Fixes #issuenumber.
Push my changes to the new analysis
It is not finished but i think it is good to have a common starting point
Changes proposed in this pull request:
@mention AdriaanRol
In order for the pull request to be merged, the following conditions must be met:
Whenever possible the pull request should
Tests are not mandatory as this is generally hard to make for instruments that interact with hardware.