implemented group delay for bessel filter.

algos/rtbolocal/algo_rtbolocal_loadfp.m

@@ -18,11 +18,10 @@ fp.QI_avg_start = -1;
 fp.QI_avg_stop = fp.QI_avg_start+(fp.stop_point-fp.start_point)*fp.timing.dt;
 
 
-
 fp.S = 12.; % To be discussed
 fp.T = 0.2; % to be discussed
-fp.geometry = 1e-07*[0.442089005423952	0.463560602573341	0.478271963378275	0.485658342691520	0.500187342455503	0.515126663126874	0.522584710589617	0.522259614266328	0.527188599159748	0.535015058758957	0.535015058758957	0.527190883888893	0.522259614266328	0.522584710589617	0.515126663126873	0.500187342455502	0.485660042839190	0.478272678725511	0.463560368115813	0.442078583866282	0.429289817645772	0.448260205984696	0.460842882873520	0.466621263799931	0.480171095734873	0.493345847482307	0.499630948341473	0.498810772203995	0.503375065583793	0.510504130051761	0.510504130051761	0.503375065583793	0.498810772203995	0.499630948341473	0.493345847482306	0.480171095734872	0.466621263799931	0.460842882873520	0.448260205984695	0.429289817645772	0.429289817645772	0.448260205984695	0.460842882873520	0.466621263799931	0.480171095734872	0.493345847482307	0.499630948341473	0.498810772203995	0.503375065583793	0.510504130051761	0.510504130051761	0.503375065583793	0.498810772203995	0.499630948341473	0.493345847482307	0.480171095734872	0.466621263799931	0.460842882873520	0.448260205984695	0.429289817645772	0.350603223105338	0.366241747344874	0.380956528872041	0.395143715381331	0.406038230666521	0.419095572480108	0.425339114283240	0.436397265632359	0.449772544071848	0.461905659063834	0.474410325021508	0.484662879038898	0.492319326166846	0.501219571883599	0.503443681213362	0.510065537868119	0.518467548534600	0.526338541797935	0.535847503150694	0.541528684871803	0.545486339836619	0.549680430277404	0.547765653715702	0.549560273020108	0.552433259507083	0.555572177571595	0.561463614990977	0.562225792387801	0.562225792387801	0.561463614990977	0.555572177571595	0.552433259507083	0.549560273020108	0.547765653715701	0.549680430277404	0.545486339836619	0.541528684871802	0.535847503150694	0.526338541797935	0.518467548534600	0.442992027601100	0.464310361690537	0.478853609167334	0.486063027216812	0.500586476716988	0.515393141718884	0.522727785767865	0.522304063467200	0.527227400790852	0.535019719634750	0.535018943584281	0.527227400790852	0.522301390210157	0.522730654671588	0.515404342526369	0.500608153085243	0.486085014629784	0.478902928153116	0.464389472856346	0.443101039536675];
-fp.grid_factor = [0.570599973201752	0.570599973201752	0.570599973201752	0.518899977207184	0.529299974441528	0.540099978446960	0.538699984550476	0.537599980831146	0.536300003528595	0.532000005245209	0.538699984550476	0.540000021457672	0.539200007915497	0.537299990653992	0.536199986934662	0.533399999141693	0.511500000953674	0.541400015354157	0.628799974918366	0.826200008392334	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.479299992322922	0.532800018787384	0.535300016403198	0.543900012969971	0.537800014019013	0.527300000190735	0.548300027847290	0.544700026512146	0.551299989223480	0.545499980449677	0.548699975013733	0.576099991798401	0.550599992275238	0.552299976348877	0.552100002765656	0.554899990558624	0.551500022411346	0.547900021076202	0.539799988269806	0.570599973201752	0.580999970436096	0.627099990844727	0.586000025272369	0.567499995231628	0.562300026416779	0.574299991130829	0.562699973583221	0.577000021934509	0.863300025463104	0.650499999523163	0.514999985694885	0.706300020217896	0.541400015354157	0.564199984073639	0.547800004482269	0.563899993896484	0.550899982452393	0.552999973297119	0.545700013637543	0.585099995136261	0.547100007534027	0.553699970245361	0.547599971294403	0.556999981403351	0.547200024127960	0.549799978733063	0.545300006866455	0.553099989891052	0.516700029373169	0.923699975013733	0.520600020885468	0.532999992370606	0.556299984455109	0.555899977684021	0.568599998950958	0.559800028800964	0.568599998950958	0.538800001144409	0.566699981689453	0.542400002479553	0.852999985218048	0.723800003528595	0.593200027942658	0.583400011062622	0.559800028800964	0.570599973201752	0.539300024509430	0.536700010299683	0.533999979496002	0.537500023841858	0.528400003910065	0.534099996089935	0.540899991989136	0.539099991321564	0.551500022411346	0.552999973297119	0.548699975013733	0.568799972534180	0.642199993133545	0.777999997138977];
+fp.geometry = 1e-07*[0.442089005423952	0.463560602573341	0.478271963378275	0.485658342691520	0.500187342455503	0.515126663126874	0.522584710589617	0.522259614266328	0.527188599159748	0.535015058758957	0.535015058758957	0.527190883888893	0.522259614266328	0.522584710589617	0.515126663126873	0.500187342455502	0.485660042839190	0.478272678725511	0.463560368115813	0.442078583866282	0.429289817645772	0.448260205984696	0.460842882873520	0.466621263799931	0.480171095734873	0.493345847482307	0.499630948341473	0.498810772203995	0.503375065583793	0.510504130051761	0.510504130051761	0.503375065583793	0.498810772203995	0.499630948341473	0.493345847482306	0.480171095734872	0.466621263799931	0.460842882873520	0.448260205984695	0.429289817645772	0.429289817645772	0.448260205984695	0.460842882873520	0.466621263799931	0.480171095734872	0.493345847482307	0.499630948341473	0.498810772203995	0.503375065583793	0.510504130051761	0.510504130051761	0.503375065583793	0.498810772203995	0.499630948341473	0.493345847482307	0.480171095734872	0.466621263799931	0.460842882873520	0.448260205984695	0.429289817645772	0.350603223105338	0.366241747344874	0.380956528872041	0.395143715381331	0.406038230666521	0.419095572480108	0.425339114283240	0.436397265632359	0.449772544071848	0.461905659063834	0.474410325021508	0.484662879038898	0.492319326166846	0.501219571883599	0.503443681213362	0.510065537868119	0.518467548534600	0.526338541797935	0.535847503150694	0.541528684871803	0.545486339836619	0.549680430277404	0.547765653715702	0.549560273020108	0.552433259507083	0.555572177571595	0.561463614990977	0.562225792387801	0.562225792387801	0.561463614990977	0.555572177571595	0.552433259507083	0.549560273020108	0.547765653715701	0.549680430277404	0.545486339836619	0.541528684871802	0.535847503150694	0.526338541797935	0.518467548534600	0.442992027601100	0.464310361690537	0.478853609167334	0.486063027216812	0.500586476716988	0.515393141718884	0.522727785767865	0.522304063467200	0.527227400790852	0.535019719634750	0.535018943584281	0.527227400790852	0.522301390210157	0.522730654671588	0.515404342526369	0.500608153085243	0.486085014629784	0.478902928153116	0.464389472856346	0.443101039536675]';
+fp.grid_factor = [0.570599973201752	0.570599973201752	0.570599973201752	0.518899977207184	0.529299974441528	0.540099978446960	0.538699984550476	0.537599980831146	0.536300003528595	0.532000005245209	0.538699984550476	0.540000021457672	0.539200007915497	0.537299990653992	0.536199986934662	0.533399999141693	0.511500000953674	0.541400015354157	0.628799974918366	0.826200008392334	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.570599973201752	0.479299992322922	0.532800018787384	0.535300016403198	0.543900012969971	0.537800014019013	0.527300000190735	0.548300027847290	0.544700026512146	0.551299989223480	0.545499980449677	0.548699975013733	0.576099991798401	0.550599992275238	0.552299976348877	0.552100002765656	0.554899990558624	0.551500022411346	0.547900021076202	0.539799988269806	0.570599973201752	0.580999970436096	0.627099990844727	0.586000025272369	0.567499995231628	0.562300026416779	0.574299991130829	0.562699973583221	0.577000021934509	0.863300025463104	0.650499999523163	0.514999985694885	0.706300020217896	0.541400015354157	0.564199984073639	0.547800004482269	0.563899993896484	0.550899982452393	0.552999973297119	0.545700013637543	0.585099995136261	0.547100007534027	0.553699970245361	0.547599971294403	0.556999981403351	0.547200024127960	0.549799978733063	0.545300006866455	0.553099989891052	0.516700029373169	0.923699975013733	0.520600020885468	0.532999992370606	0.556299984455109	0.555899977684021	0.568599998950958	0.559800028800964	0.568599998950958	0.538800001144409	0.566699981689453	0.542400002479553	0.852999985218048	0.723800003528595	0.593200027942658	0.583400011062622	0.559800028800964	0.570599973201752	0.539300024509430	0.536700010299683	0.533999979496002	0.537500023841858	0.528400003910065	0.534099996089935	0.540899991989136	0.539099991321564	0.551500022411346	0.552999973297119	0.548699975013733	0.568799972534180	0.642199993133545	0.777999997138977]';
 
 % counts conversion
 fp.v_gain=single(1.25); % voltage gain used on the BOLO8's ADCs
@@ -33,6 +32,7 @@ fp.power_bit_conversion = 2^(18);
 % Change to TP
 fp.manual_exc_voltage_idx = uint8(1); % 0 based 
 fp.filter_cutoff = uint8(30); %range: up to 100Hz -> input to deconvolution function
+fp.ECRH_grid_on = logical(1);
 
 % fp.refmodel1=algo_demo1_referenced1_loadfp(); % fp for referenced subsystem 1
 

algos/rtbolocal/algo_rtbolocal_outBus_def.m

@@ -8,7 +8,7 @@ clear elems;
 
 ii=1;
 elems(ii) = Simulink.BusElement;
-elems(ii).Name = 'rt_power';
+elems(ii).Name = 'rt_radiance';
 elems(ii).Dimensions = [120 1];
 elems(ii).DataType = 'double';
 elems(ii).SampleTime = -1;

algos/rtbolocal/bilinear_codeGen.m

@@ -39,7 +39,7 @@ function [zd, pd, kd, dd] = bilinear_codeGen(z, p, k, bessel_order)
     r = sqrt(t);
     t1 = eye(size(as)) + as*t/2;
     t2 = eye(size(as)) - as*t/2;
-    ad = t2\t1
+    ad = t2\t1;
     bd = t/r*(t2\bs);
     cd = r*cs/t2;
     dd = cs/t2*bs*t/2 + ds;