Skip to content
Snippets Groups Projects
Commit 6069c5c9 authored by Cristian Galperti's avatar Cristian Galperti
Browse files

rtthomson resimulation working again

- now all input signals are taken
  from the processing thread, comprising prev ADC
  data
parent da959e29
No related branches found
No related tags found
No related merge requests found
......@@ -308,15 +308,15 @@ classdef SCDclass_taskmdsloadprevADC < SCDclass_task
mdsopen('rtc',shot);
T=timeseries;
T.TimeInfo.Units='samples';
if shot<74139
if shot<74142
warning('SCDclass_taskmdsloadprevADC:init','node 09 too old shot to actualize on');
value=0;
time=0;
samplecnt=0;
return;
else
samplecnt=mdsvalue('node09.thread02.mems.mem_002');
timeraw=mdsvalue('node09.thread02.mems.mem_008');
samplecnt=mdsvalueraw('node09.thread02.mems.mem_002');
timeraw=mdsvalueraw('node09.thread02.mems.mem_008');
adcraw=mdsvalueraw('node09.thread02.mems.mem_009');
end
......@@ -328,10 +328,11 @@ classdef SCDclass_taskmdsloadprevADC < SCDclass_task
if obj.verbose==1
fprintf('Getting data for bus: ''%s'' (%s, shot %d) 0%% ', obj.modelbus, obj.classname, shot);
end
s=size(adcraw);
for ii=1:768
channelstr=sprintf(['node09.adc.adc_%03d.raw'],ii);
adcthread01=int16(mdsvalueraw(channelstr));
datamatrix(:,ii)=adcthread01(samplebase);
if ii<=s(1)
datamatrix(:,ii)=adcraw(ii,:)';
end
if obj.verbose==1 && mod(ii,obj.logdecimate)==0
fprintf('%.0f%% ', ii/768*100);
end
......@@ -341,10 +342,9 @@ classdef SCDclass_taskmdsloadprevADC < SCDclass_task
if obj.verbose==1
fprintf('100%% \n');
end
T.Data=single(timeraw);
T.Data=timeraw;
time=T;
T.Data=int32(samplecnt);
T.Data=samplecnt;
samplecnt=T;
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment