Skip to content

Commit d7fd961

Browse files
authored
Bug fixes after v0.2.2, heading to v0.2.3 (#115)
* Bug fixes after v0.2.2, heading to v0.2.3 * Updating url of GitHub repository, previously INM-6, now NeuralEnsemble * Typo fix * RegEx fix for t_start and t_stop
1 parent c74d16e commit d7fd961

File tree

12 files changed

+33
-33
lines changed

12 files changed

+33
-33
lines changed

cobrawap/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = '0.2.1'
1+
__version__ = '0.2.2'
22
__author__ = 'Cobrawap authors and contributors <[email protected]>'

cobrawap/pipeline/README.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Manual Installation For Developers
4040
----------------------------------
4141
For working on the source code, it is recommended to fork the Cobrawap repository from Github, and clone it or set it as a submodule to another project repository.
4242

43-
`Create a fork <https://docs.github.com/en/get-started/quickstart/fork-a-repo>`_ in your github domain of the upstream location `github.com/INM-6/cobrawap <https://github.com/INM-6/cobrawap>`_ and clone the repository to your local machine (:code:`git clone [email protected]:<your-github-handle>/cobrawap.git`).
43+
`Create a fork <https://docs.github.com/en/get-started/quickstart/fork-a-repo>`_ in your github domain of the upstream location `github.com/NeuralEnsemble/cobrawap <https://github.com/NeuralEnsemble/cobrawap>`_ and clone the repository to your local machine (:code:`git clone [email protected]:<your-github-handle>/cobrawap.git`).
4444

4545
Then use pip to install the module from your local directory in an editable mode.
4646
.. code-block:: bash
@@ -72,7 +72,7 @@ See also `Command Line Interface > create <https://cobrawap.readthedocs.io/en/la
7272
cobrawap create
7373
7474
This will prompt the setting of a profile name and optionally a parent profile name from which to copy the parameter presets. The parent profile name will be prepended to the profile name (see :ref:`config_profiles`). Optionally, these names can be directly passed to the :code:`create` command with :code:`--profile` and :code:`--parent_profile`.
75-
The profile and parent name will be used to create correspondingly named config files for each stage: ``config_<parent>_<profile>.yaml`` for the first stage and ``config_<parent>.yaml`` for all other stages.
75+
The profile and parent name will be used to create correspondingly named config files for each stage: ``config_<parent>_<profile>.yaml`` for the first stage and ``config_<parent>.yaml`` for all other stages.
7676

7777
For specifying the data entry into the pipeline :code:`create` also asks for the path to the dataset and a name for the corresponding loading script. This information can also be passed to the :code:`create` command with :code:`--data_path` and :code:`--loading_script_name`.
7878
Both information are written into the corresponding config file of the first stage. Furthermore, a template loading script is created in ``<config_path>/stage01_data_entry/scripts/`` which has to be adapted to load the specific dataset.
@@ -90,7 +90,7 @@ See also `Command Line Interface > add_profile <https://cobrawap.readthedocs.io/
9090
This will prompt the setting of a profile and parent profile name just as for :code:`cobrawap create`. Additionally, it requires to specify the stages for which to create new config files (can be directly passed with :code:`--stages`).
9191
Consequently, this will create new config files ``config_<parent>_<profile>.yaml`` for the selected stages, copying the parameter presents from ``config_<parent>.yaml``.
9292

93-
If the stage selection includes the first stage, this will again prompt the additional setting of a :code:`--data_path` and :code:`--loading_script_name` as for :code:`cobrawap create`.
93+
If the stage selection includes the first stage, this will again prompt the additional setting of a :code:`--data_path` and :code:`--loading_script_name` as for :code:`cobrawap create`.
9494

9595
Running the Pipeline
9696
--------------------
@@ -124,7 +124,7 @@ See also `Command Line Interface > run_block <https://cobrawap.readthedocs.io/en
124124
125125
cobrawap run_block
126126
127-
This command allows to execute the python script of a specific block. The block should be specified as :code:`<stage_name>.<block_name>` and can be passed with :code:`--block`. Any additional command line arguments are passed to the script.
127+
This command allows to execute the python script of a specific block. The block should be specified as :code:`<stage_name>.<block_name>` and can be passed with :code:`--block`. Any additional command line arguments are passed to the script.
128128

129129
To display the help text of the block script add :code:`--block_help`.
130130

@@ -171,7 +171,7 @@ In the setting file, you can also optionally set a ``configs_dir`` path to defin
171171

172172
Config Profiles
173173
---------------
174-
Config profiles make it possible to group specific parameter configurations for different datasets or applications across stages, and easily switch between them. You can set the ``PROFILE`` parameter in the top-level config file (or via the command line when running the pipeline). The corresponding pipeline output will be stored in ``{output_path}/{profile}/``, and for each stage the specific config file ``{stage}/configs/config_{profile}.yaml`` is used.
174+
Config profiles make it possible to group specific parameter configurations for different datasets or applications across stages, and easily switch between them. You can set the ``PROFILE`` parameter in the top-level config file (or via the command line when running the pipeline). The corresponding pipeline output will be stored in ``{output_path}/{profile}/``, and for each stage the specific config file ``{stage}/configs/config_{profile}.yaml`` is used.
175175

176176
To reduce redundancy and the number of config files, profiles use a hierachical naming convention where each subgroup is seperated with an underscore ``_``, for example, ``config_ecog_session1_trial7.yaml``. When a stage does not contain this exact file name, it falls back onto the parent group (``config_ecog_session1.yaml``) and when it also doesn't exist onto its parent group (``config_ecog.yaml``) and so on. Thus, config specialization is only applied in the stages where it is needed. Furthermore, you can add variants to the profile name with a ``|`` delimiter to additionally switch analysis types, for example, ``config_caimg_session1|subsampled.yaml``.
177177
The selection order is the following:
@@ -264,4 +264,3 @@ Input dependencies to blocks are handled by the corresponding rule in the *Snake
264264
Block Outputs
265265
-------------
266266
All output from blocks (data and figures) is stored in ``{output_path}/{profile}/{STAGE_NAME}/{block_name}/``.
267-

cobrawap/pipeline/stage01_data_entry/README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Stage 01 - Data Entry
44

55
**This stage handles the loading and representation of the input dataset and metadata into the standard format for the pipeline.**
66

7-
`config template <https://github.com/INM-6/cobrawap/blob/master/pipeline/stage01_data_entry/configs/config_template.yaml>`_
7+
`config template <https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage01_data_entry/configs/config_template.yaml>`_
88

99
Input
1010
=====
@@ -26,7 +26,7 @@ Any additional metadata and neo objects in the ``neo.Block`` passed along throug
2626
*should pass* |check_input|_
2727

2828
.. |check_input| replace:: *check_input.py*
29-
.. _check_input: https://github.com/INM-6/cobrawap/blob/master/pipeline/stage01_data_entry/configs/scripts/check_input.py
29+
.. _check_input: https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage01_data_entry/configs/scripts/check_input.py
3030

3131
Required Data Capabilities
3232
==========================
@@ -67,7 +67,7 @@ Having the data and metadata already in a standard format (e.g., Neo_) as used w
6767
* Set the additional metadata for the config parameter as required (*can be revisited when writing the loading script*)
6868

6969
3. Create the corresponding loading script.
70-
* Copy the ``enter_data_template.py`` in ``cobrawap/pipeline/stage01_data_entry/scripts/`` and and name it as specified in the just created config file.
70+
* Copy the ``enter_data_template.py`` in ``cobrawap/pipeline/stage01_data_entry/scripts/`` and and name it as specified in the just created config file.
7171
* Put the script either in the same folder or in ``<configs_dir>/stage01_data_entry/scripts/`` if defined.
7272

7373
4. Edit the loading script.

cobrawap/pipeline/stage02_processing/README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Stage 02 - Processing
33
=====================
44
**This stage prepares the data for analysis. The user can select the required processing steps depending on the data and analysis objectives.**
55

6-
`config template <https://github.com/INM-6/cobrawap/blob/master/pipeline/stage02_processing/configs/config_template.yaml>`_
6+
`config template <https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage02_processing/configs/config_template.yaml>`_
77

88
Input
99
=====
@@ -17,7 +17,7 @@ A ``neo.Block`` and ``Segment`` object containing an ``AnalogSignal`` object con
1717
*should pass* |check_input|_
1818

1919
.. |check_input| replace:: *check_input.py*
20-
.. _check_input: https://github.com/INM-6/cobrawap/blob/master/pipeline/stage02_processing/scripts/check_input.py
20+
.. _check_input: https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage02_processing/scripts/check_input.py
2121

2222
Output
2323
======

cobrawap/pipeline/stage02_processing/Snakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ use rule template as plot_processed_traces with:
4848
original_data=config.STAGE_INPUT)
4949
output:
5050
img_dir = directory(OUTPUT_DIR /
51-
str("processed_traces_{t_start}-{t_stop}s")
51+
str("processed_traces_{t_start}-{t_stop}s"))
5252

5353

5454
use rule template as plot_power_spectrum with:

cobrawap/pipeline/stage03_trigger_detection/README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Stage 03 - Trigger Detection
44

55
**This stage detects the potential passing of wavefronts on each channel (for example, transitions between Down and Up states) as trigger times.**
66

7-
`config template <https://github.com/INM-6/cobrawap/blob/master/pipeline/stage03_trigger_detection/configs/config_template.yaml>`_
7+
`config template <https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage03_trigger_detection/configs/config_template.yaml>`_
88

99
Input
1010
=====
@@ -14,7 +14,7 @@ A ``neo.Block`` and ``Segment`` object containing an ``AnalogSignal`` object con
1414
*should pass* |check_input|_
1515

1616
.. |check_input| replace:: *check_input.py*
17-
.. _check_input: https://github.com/INM-6/cobrawap/blob/master/pipeline/stage03_trigger_detection/scripts/check_input.py
17+
.. _check_input: https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage03_trigger_detection/scripts/check_input.py
1818

1919
Output
2020
======

cobrawap/pipeline/stage04_wave_detection/README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Stage 04 - Wave Detection
44

55
**This stage detects individual propagating waves based on the local transition times and optionally complements the wave description with additionally derived properties.**
66

7-
`config template <https://github.com/INM-6/cobrawap/blob/master/pipeline/stage04_wave_detection/configs/config_template.yaml>`_
7+
`config template <https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage04_wave_detection/configs/config_template.yaml>`_
88

99
Input
1010
=====
11-
A ``neo.Block`` and ``Segment`` object containing
11+
A ``neo.Block`` and ``Segment`` object containing
1212

1313
an ``AnalogSignal`` object with all signal channels with
1414

@@ -23,7 +23,7 @@ an ``Event`` object named *'transitions'* with
2323
*should pass* |check_input|_
2424

2525
.. |check_input| replace:: *check_input.py*
26-
.. _check_input: https://github.com/INM-6/cobrawap/blob/master/pipeline/stage04_wave_detection/scripts/check_input.py
26+
.. _check_input: https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage04_wave_detection/scripts/check_input.py
2727

2828
Output
2929
======
@@ -45,4 +45,4 @@ The intermediate results and plots of each processing block are stored in the ``
4545
Usage
4646
=====
4747
In this stage offers alternative wave detection methods (*choose one*), which can be selected via the ``DETECTION_BLOCK`` parameter.
48-
There are blocks to add additional properties, to be selected (*choose any*) via the ``ADDITIONAL_PROPERTIES`` parameter.
48+
There are blocks to add additional properties, to be selected (*choose any*) via the ``ADDITIONAL_PROPERTIES`` parameter.

cobrawap/pipeline/stage05_channel_wave_characterization/README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Stage 05 - Channel Wave Characterization
44

55
**This stage evaluates the detected waves by deriving characteristic channel-wise measures.**
66

7-
`config template <https://github.com/INM-6/cobrawap/blob/master/pipeline/stage05_channel_wave_characterization/configs/config_template.yaml>`_
7+
`config template <https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage05_channel_wave_characterization/configs/config_template.yaml>`_
88

99
Input
1010
=====
@@ -20,7 +20,7 @@ Some blocks may require the additional ``AnalogSignal`` object called *'optical_
2020
*should pass* |check_input|_
2121

2222
.. |check_input| replace:: *check_input.py*
23-
.. _check_input: https://github.com/INM-6/cobrawap/blob/master/pipeline/stage05_channel_wave_characterization/scripts/check_input.py
23+
.. _check_input: https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage05_channel_wave_characterization/scripts/check_input.py
2424

2525
Output
2626
======
@@ -30,5 +30,5 @@ A table (``pandas.DataFrame``), containing
3030

3131
Usage
3232
=====
33-
In this stage, any number of blocks can be selected via the ``MEASURES`` parameter and are applied on the stage input (*choose any*).
34-
To include specific metadata in the output table, select the corresponding annotation keys with ``INCLUDE_KEYS``, or to include all available metadata execept some specifiy only the corresponding annotations keys in ``IGNORE_KEYS``.
33+
In this stage, any number of blocks can be selected via the ``MEASURES`` parameter and are applied on the stage input (*choose any*).
34+
To include specific metadata in the output table, select the corresponding annotation keys with ``INCLUDE_KEYS``, or to include all available metadata execept some specifiy only the corresponding annotations keys in ``IGNORE_KEYS``.

cobrawap/pipeline/stage05_wave_characterization/README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Stage 05 - Wave Characterization
44

55
**This stage evaluates the detected waves by deriving characteristic wave-wise measures.**
66

7-
`config template <https://github.com/INM-6/cobrawap/blob/master/pipeline/stage05_wave_characterization/configs/config_template.yaml>`_
7+
`config template <https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage05_wave_characterization/configs/config_template.yaml>`_
88

99
Input
1010
=====
@@ -20,7 +20,7 @@ a ``neo.Event`` object named _'wavefronts'_, containing
2020
*should pass* |check_input|_
2121

2222
.. |check_input| replace:: *check_input.py*
23-
.. _check_input: https://github.com/INM-6/cobrawap/blob/master/pipeline/stage05_wave_characterization/scripts/check_input.py
23+
.. _check_input: https://github.com/NeuralEnsemble/cobrawap/blob/master/pipeline/stage05_wave_characterization/scripts/check_input.py
2424

2525
Output
2626
======
@@ -31,5 +31,5 @@ A table (``pandas.DataFrame``), containing
3131

3232
Usage
3333
=====
34-
In this stage, any number of blocks can be selected via the ``MEASURES`` parameter and are applied on the stage input (*choose any*).
35-
To include specific metadata in the output table, select the corresponding annotation keys with ``INCLUDE_KEYS``, or to include all available metadata execept some specifiy only the corresponding annotations keys in ``IGNORE_KEYS``.
34+
In this stage, any number of blocks can be selected via the ``MEASURES`` parameter and are applied on the stage input (*choose any*).
35+
To include specific metadata in the output table, select the corresponding annotation keys with ``INCLUDE_KEYS``, or to include all available metadata execept some specifiy only the corresponding annotations keys in ``IGNORE_KEYS``.

cobrawap/pipeline/stageXY_template/README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Stage XY - Template
44

55
**Short statement of the stage's purpose**
66

7-
`config template <https://github.com/INM-6/cobrawap/master/editing/pipeline/stageXY_template/configs/config_template.yaml>`_
7+
`config template <https://github.com/NeuralEnsemble/cobrawap/master/editing/pipeline/stageXY_template/configs/config_template.yaml>`_
88

99
Input
1010
=====
@@ -13,12 +13,12 @@ Describe type and format of the minimally required data and metadata.
1313
*should pass* |check_input|_
1414

1515
.. |check_input| replace:: *check_input.py*
16-
.. _check_input: https://github.com/INM-6/cobrawap/master/editing/pipeline/stageXY_template/scripts/check_input.py
16+
.. _check_input: https://github.com/NeuralEnsemble/cobrawap/master/editing/pipeline/stageXY_template/scripts/check_input.py
1717

1818
Output
1919
======
2020
Describe type and format of the stage output data and metadata, eventual intermediate output, and where it is stored.
2121

2222
Usage
2323
=====
24-
Describe the functionality of the stage, what type of blocks are used and how they can be arranged, and eventually special stage parameters. However, an account of the exact blocks and their features should be placed into the Snakefile's and scripts' docstring.
24+
Describe the functionality of the stage, what type of blocks are used and how they can be arranged, and eventually special stage parameters. However, an account of the exact blocks and their features should be placed into the Snakefile's and scripts' docstring.

0 commit comments

Comments
 (0)