include changes of PR #84 that relate to eeg_rikesh

eeg_rishikesh/channels.tsv

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 name	description	type	status
 A1	Fp1	EEG	Good
 A2	AF7	EEG	Good
@@ -63,6 +64,73 @@ B29	P10	EEG	Good
 B30	PO8	EEG	Good
 B31	PO4	EEG	Good
 B32	O2	EEG	Good
+=======
+name  description type  status  unit
+A1	Fp1	EEG	Good uV
+A2	AF7	EEG	Good uV
+A3	AF3	EEG	Good uV
+A4	F1	EEG	Good uV
+A5	F3	EEG	Good uV
+A6	F5	EEG	Good uV
+A7	F7	EEG	Good uV
+A9	FC5	EEG	Good uV
+A8	FT7	EEG	Good uV
+A10	FC3	EEG	Good uV
+A11	FC1	EEG	Good uV
+A12	C1	EEG	Good uV
+A13	C3	EEG	Good uV
+A14	C5	EEG	Good uV
+A15	T7	EEG	Good uV
+A16	TP7	EEG	Good uV
+A17	CP5	EEG	Good uV
+A18	CP3	EEG	Good uV
+A19	CP1	EEG	Good uV
+A20	P1	EEG	Good uV
+A21	P3	EEG	Good uV
+A22	P5	EEG	Good uV
+A23	P7	EEG	Good uV
+A24	P9	EEG	Good uV
+A25	PO7	EEG	Good uV
+A26	PO3	EEG	Good uV
+A27	O1	EEG	Good uV
+A29	Oz	EEG	Good uV
+A28	Iz	EEG	Good uV
+A30	POz	EEG	Good uV
+A31	Pz	EEG	Good uV
+A32	CPz	EEG	Good uV
+B1	Fpz	EEG	Good uV
+B2	Fp2	EEG	Good uV
+B3	AF8	EEG	Good uV
+B4	AF4	EEG	Good uV
+B5	AFz	EEG	Good uV
+B6	Fz	EEG	Good uV
+B7	F2	EEG	Good uV
+B8	F4	EEG	Good uV
+B9	F6	EEG	Good uV
+B10	F8	EEG	Good uV
+B11	FT8	EEG	Good uV
+B12	FC6	EEG	Good uV
+B13	FC4	EEG	Good uV
+B14	FC2	EEG	Good uV
+B15	FCz	EEG	Good uV
+B16	Cz	EEG	Good uV
+B17	C2	EEG	Good uV
+B18	C4	EEG	Good uV
+B19	C6	EEG	Good uV
+B20	T8	EEG	Good uV
+B21	TP8	EEG	Good uV
+B22	CP6	EEG	Good uV
+B23	CP4	EEG	Good uV
+B25	P2	EEG	Good uV
+B24	CP2	EEG	Good uV
+B26	P4	EEG	Good uV
+B27	P6	EEG	Good uV
+B28	P8	EEG	Good uV
+B29	P10	EEG	Good uV
+B30	PO8	EEG	Good uV
+B31	PO4	EEG	Good uV
+B32	O2	EEG	Good uV
+>>>>>>> 50c58bb094a79fd63be23e592de1d48ef2de36a9
 EXG1	EXG1	EEG	Unused
 EXG2	EXG2	EEG	Unused
 EXG3	EXG3	EEG	Unused

eeg_rishikesh/dataset_description.json

@@ -1,11 +1,10 @@
 {
 	"Name": "Mind wandering in experienced and novice meditators",
-	"BIDSVersion": "??????",
+	"BIDSVersion": "1.2.0",
 	"License": "CC0",
-	"Authors": ["Arnaud Delorme and Tracy Brandmeyer"],
+	"Authors": "Arnaud Delorme and Tracy Brandmeyer",
 	"Acknowledgements": "This work was supported by Grants from the ANR (Agence Nationale pour la Recherche) ANR-12-JSH2-0009 and the BIAL foundation BIAL-08-162",
 	"HowToAcknowledge": "Please cite the reference below",
-	"Funding": "list your funding sources",
-	"ReferencesAndLinks": "Brandmeyer and Delorme (2016) Reduced mind wandering in experienced meditators and associated EEG correlates, Exp Brain Res, DOI 10.1007/s00221-016-4811-5",
-	"DatasetDOI": "????????"
+	"Funding":"This work was supported by Grants from the ANR (Agence Nationale pour la Recherche) ANR-12-JSH2-0009 and the BIAL foundation BIAL-08-162",
+	"ReferencesAndLinks": {"Brandmeyer and Delorme (2016) Reduced mind wandering in experienced meditators and associated EEG correlates, Exp Brain Res, DOI 10.1007/s00221-016-4811-5", "ftp://sccn.ucsd.edu/pub/arno/rishikesh/"}
 }

eeg_rishikesh/task-medprobe_eeg.json

@@ -0,0 +1,18 @@
+{
+  "TaskName":"Mind wandering",
+  "TaskDescription": "Meditate and report at regular intervals (see README.txt for details)",
+  "InstitutionName": "Meditation Research Institute, Rishikesh, India",
+  "SamplingFrequency": 2048,
+  "EEGChannelCount":  64,
+  "EOGChannelCount": 0,
+  "EEGReference": "bipolar",
+  "TriggerChannelCount": 1,
+  "PowerLineFrequency": 50,
+  "EEGPlacementScheme": "10-20",
+  "Manufacturer": "Biosemi",
+  "ManufacturerModelName": "??",
+  "CapManufacturer": "Biosemi",
+  "CapModelName": "??",
+  "HardwareFilters": {"Low-Pass butterworth":350},
+  "RecordingType": "continuous",
+}