| @@ -111,14 +111,10 class SpectraProc(ProcessingUnit): | |||
|
|
111 | 111 | |
|
|
112 | 112 | if self.dataIn.type == "Spectra": |
|
|
113 | 113 | self.dataOut.copy(self.dataIn) |
|
|
114 | <<<<<<< HEAD | |
|
|
115 | # self.__selectPairs(pairsList) | |
|
|
116 | ======= | |
|
|
117 | 114 | if not pairsList: |
|
|
118 | 115 | pairsList = itertools.combinations(self.dataOut.channelList, 2) |
|
|
119 | 116 | if self.dataOut.data_cspc is not None: |
|
|
120 | 117 | self.__selectPairs(pairsList) |
|
|
121 | >>>>>>> 8048843f4edfb980d0968f42f82054783b84e1cc | |
|
|
122 | 118 | return True |
|
|
123 | 119 | |
|
|
124 | 120 | if self.dataIn.type == "Voltage": |
General Comments 0
You need to be logged in to leave comments.
Login now