diff --git a/targets/PROJECTS/CORRIDOR/emos_read_v2.m b/targets/PROJECTS/CORRIDOR/emos_read_v2.m
index cd5f7ecf1df6ca48510f0f6ee7e720a969486057..df9c9c1a5266dd98896253af8e9f845a454002a2 100644
--- a/targets/PROJECTS/CORRIDOR/emos_read_v2.m
+++ b/targets/PROJECTS/CORRIDOR/emos_read_v2.m
@@ -1,114 +1,146 @@
 close all
 clear all
 
-enable_plots=1; %eanbles figures
+global symbols_per_slot slots_per_frame;
+
+enable_plots=2; %enables figures
 
 %% preload and init data
 addpath('../../../openair1/PHY/LTE_REFSIG');
 primary_synch; %loads the primary sync signal
-pss_t = upsample(primary_synch0_time,4);
 
 %load('E:\EMOS\corridor\ofdm_pilots_sync_2048_v7.mat');
 load('ofdm_pilots_sync_30MHz.mat');
 
-ofdm_symbol_length = num_carriers + prefix_length;
-frame_length = ofdm_symbol_length*num_symbols_frame;
-useful_carriers = num_carriers-num_zeros-1;
+n_carriers = 2; % use 1 for UHF and 2 for 2.6GHz
+nframes = 100; % frames in one block
+symbols_per_slot = 6;
+slots_per_frame = 20;
+
+switch n_carriers
+    case 1,
+        p = init_params(25,3,4); %this can be 25, 50, or 100
+        pss_t = upsample(primary_synch0_time,4);
+        
+        %filename = 'E:\EMOS\corridor\trials1\eNB_data_20140331_UHF_run1.EMOS';
+        filename = 'D:\trials1 train extracted\eNB_data_20140331_UHF_run1.EMOS';
+        
+    case 2,
+        p(1) = init_params(50,2,4);
+        p(2) = init_params(100,2,4);
+        pss_t = upsample(primary_synch0_time,4*2); % this assumes we are doing the sync on the first carrier, which is 10MHz
+        
+        %filename = 'E:\EMOS\corridor\trials1\eNB_data_20140331_UHF_run1.EMOS';
+        filename = 'D:\trials1 train extracted\eNB_data_20140331_2.6GHz_run1.EMOS';
+end
 
-%filename = 'E:\EMOS\corridor\trials1\eNB_data_20140331_UHF_run1.EMOS';
-filename = 'D:\trials1 train extracted\eNB_data_20140331_UHF_run1.EMOS';
 destdir = 'E:\EMOS\corridor\trials1 train';
 
-samples_slot = 7680/2;
-slots_per_frame = 20;
-nframes = 100;
-nant_rx=3;
-nant_tx=4;
+% derived parameters
+samples_slot_agg = sum([p.nant_rx].*[p.samples_slot]);
+num_symbols_frame = symbols_per_slot*slots_per_frame;
 
 d = dir(filename);
-nblocks = floor(d.bytes/(samples_slot*slots_per_frame*nframes*nant_rx*4));
-PDP_total = zeros(nblocks*nframes,useful_carriers/4,nant_tx,nant_rx);
+nblocks = floor(d.bytes/(samples_slot_agg*slots_per_frame*nframes*4));
+PDP_total = zeros(nblocks*nframes,p(1).useful_carriers/4,p(1).nant_tx,p(1).nant_rx);
 
 %% main loop
 fid = fopen(filename,'r');
 
-vStorage = [];  %%
+vStorage1 = [];
+vStorage2 = [];
 
-
-block = 1; %
+block = 1;
 flag1 = 1;
 start=2;
 
 threshold = 3e+4 ; % maybe should change that !!!!
 
-%  fseek(fid,samples_slot*slots_per_frame*nframes*nant*102*2,'bof');
-%  %advance 102 sec
+fseek(fid,samples_slot_agg*slots_per_frame*nframes*120*2,'bof'); %advance 30 sec
 
 while ~feof(fid)
     fprintf(1,'Processing block %d of %d',block,nblocks);
     
-    [v,c]=fread(fid, samples_slot*slots_per_frame*nframes*nant_rx*2, 'int16',0,'ieee-le');
+    [v,c]=fread(fid, 2*samples_slot_agg*slots_per_frame*nframes, 'int16',0,'ieee-le');
     if (c==0)
         break
     end
-    v1 = double(v(1:2:end))+1j*double(v(2:2:end));
-    
-    nframes = 100;
+    v0 = double(v(1:2:end))+1j*double(v(2:2:end));
     
-    v2 = zeros(samples_slot*slots_per_frame*nframes,nant_rx);
+    v1 = zeros(p(1).samples_slot*slots_per_frame*nframes,p(1).nant_rx);
     for slot=1:slots_per_frame*nframes
-        for a=1:nant_rx
-            v2((slot-1)*samples_slot+1:slot*samples_slot,a) = ...
-                v1((slot-1)*samples_slot*nant_rx+(a-1)*samples_slot+1:...
-                   (slot-1)*samples_slot*nant_rx+ a   *samples_slot,1);
+        for a=1:p(1).nant_rx
+            v1((slot-1)*p(1).samples_slot+1:slot*p(1).samples_slot,a) = ...
+                v0((slot-1)*samples_slot_agg+(a-1)*p(1).samples_slot+1:...
+                   (slot-1)*samples_slot_agg+ a   *p(1).samples_slot,1);
         end
     end
     
+    if n_carriers==2
+        v2 = zeros(p(2).samples_slot*slots_per_frame*nframes,p(2).nant_rx);
+        for slot=1:slots_per_frame*nframes
+            for a=1:p(2).nant_rx
+                v2((slot-1)*p(2).samples_slot+1:slot*p(2).samples_slot,a) = ...
+                    v0((slot-1)*samples_slot_agg+(a-1)*p(2).samples_slot+1:...
+                       (slot-1)*samples_slot_agg+ a   *p(2).samples_slot,1);
+            end
+        end
+    end
     
-    v2 = [vStorage; v2] ;%%
-    if size(v2,1) > frame_length*nframes ;
-        nframes = floor(size(v2,1) / frame_length) ;
-        vStorage = v2(frame_length*nframes+1:end,:) ;
-        v2(frame_length*nframes + 1 : end,:) = [] ;
+    v1 = [vStorage1; v1] ;
+    if size(v1,1) > p(1).frame_length*nframes ;
+        nframes = floor(size(v1,1) / p(1).frame_length) ;
+        vStorage1 = v1(p(1).frame_length*nframes+1:end,:) ;
+        v1(p(1).frame_length*nframes + 1 : end,:) = [] ;
         start = 1 ;
     end
     
+    if n_carriers==2
+        v2 = [vStorage1; v2] ;
+        if size(v2,1) > p(2).frame_length*nframes ;
+            nframes = floor(size(v2,1) / p(2).frame_length) ;
+            vStorage1 = v2(p(2).frame_length*nframes+1:end,:) ;
+            v2(p(2).frame_length*nframes + 1 : end,:) = [] ;
+            start = 1 ;
+        end
+    end
+    
     if enable_plots>=2
         figure(1)
-        plot(20*log10(abs(fftshift(fft(v2)))))
+        plot(20*log10(abs(fftshift(fft(v1)))))
     end
     
     %% frame start detection
     if flag1==1
-        [corr,lag] = xcorr(v2(:,1),pss_t);
+        [corr,lag] = xcorr(v1(:,1),pss_t);
         %[m,idx]=max(abs(corr));
         %[m,idx]=peaksfinder(corr,frame_length);
         
-        tmp   = corr(nframes*slots_per_frame*samples_slot:end);
-        tmp2  = reshape(tmp,slots_per_frame*samples_slot,nframes);
+        tmp   = corr(nframes*slots_per_frame*p(1).samples_slot:end);
+        tmp2  = reshape(tmp,slots_per_frame*p(1).samples_slot,nframes);
         [m,idx] = max(abs(tmp2),[],1);
-       
-%         meanCorr = mean(abs(tmp2));
-%         [mm,where] = max(m./meanCorr)
+        
+        %         meanCorr = mean(abs(tmp2));
+        %         [mm,where] = max(m./meanCorr)
         
         idx(m < threshold) = [];
         if size(idx,2) <= 1
             flag1 = 1 ;
             flag2 = 0 ;
             
-            vStorage = [];
-%         elseif size(idx,2) == nframes
-%             
-%             flag1 = 0;
-%             flag2 = 1;
+            vStorage1 = [];
+            %         elseif size(idx,2) == nframes
+            %
+            %             flag1 = 0;
+            %             flag2 = 1;
         else
             flag1 = 0 ;
             flag2 = 1 ;
         end
         
-        frame_offset = round(median(idx)) - prefix_length;
+        frame_offset = round(median(idx)) - p(1).prefix_length;
+        
         
-
         if enable_plots>=2
             figure(2);
             hold off
@@ -117,76 +149,103 @@ while ~feof(fid)
             plot(frame_offset,m(1),'ro')
         end
     else
-        frame_offset = 0; %%%%% line 93 florian's 
+        frame_offset = 0;
     end
     
+    %%
     if flag2 == 1
         for i=start:nframes;
             fprintf(1,'.');
-            frame_start = (slots_per_frame*samples_slot)*(i-1)+frame_offset+1;
-            %frame_start = lag(idx(i))-prefix_length;
-            % frame_start = lag(i) - prefix_length;
+            frame_start1 = (slots_per_frame*p(1).samples_slot)*(i-1)+frame_offset+1;
+            if n_carriers==2
+                frame_start2 = (slots_per_frame*p(2).samples_slot)*(i-1)+frame_offset*2+1;
+            end
             
             if i<nframes
                 %% ofdm receiver
-                received_f = OFDM_RX(v2(frame_start:frame_start+frame_length,:),num_carriers,useful_carriers,prefix_length,num_symbols_frame);
+                received_f1 = OFDM_RX(v1(frame_start1:frame_start1+p(1).frame_length,:),p(1).num_carriers,p(1).useful_carriers,p(1).prefix_length,num_symbols_frame);
+                if n_carriers==2
+                    received_f2 = OFDM_RX(v2(frame_start2:frame_start2+p(2).frame_length,:),p(2).num_carriers,p(2).useful_carriers,p(2).prefix_length,num_symbols_frame);
+                end
             else
-                vStorage = [v2(frame_start:end,:) ; vStorage];  %%
+                vStorage1 = [v1(frame_start1:end,:) ; vStorage1];  %%
+                if n_carriers==2
+                    vStorage2 = [v2(frame_start2:end,:) ; vStorage2];  %%
+                end
             end
-        %% MIMO channel estimation
-        H = zeros(num_symbols_frame/2,useful_carriers/4,nant_tx,nant_rx);
-        for itx=1:nant_tx
-            % f_start and t_start indicate the start of the pilots in time
-            % and frequency according to the specifications (see .doc file). 
-            % t_start has to be >=2, since the first symbol is the PSS.
-            f_start = mod(itx-1,2)*2+1;
-            t_start = floor((itx-1)/2)+1;
-            for irx=1:nant_rx
-                H(:,:,itx,irx)=conj(squeeze(f3(itx,t_start:2:end,f_start:4:end))).*received_f(t_start:2:end,f_start:4:end,irx);
+            
+            %% MIMO channel estimation
+            if (n_carriers==1)
+                transmit_f1 = f3;
+            else
+                transmit_f1 = f2;
+                transmit_f2 = f1;
             end
-        end
-        Ht = ifft(H,[],2);
-        PDP = mean(abs(Ht).^2,1);
-        PDP_all = squeeze(mean(mean(PDP,3),4));
-        PDP_total((block-1)*nframes+i+1,:,:,:) = PDP;
-        
-        % adjust frame offset base on channel estimate to compensate for
-        % timing drift. We try to keep the peak of the impulse response at
-        % sample prefix_length/8.
-        [m,idx] = max(fft(ifft(PDP_all),num_carriers));
-        offset = idx - prefix_length/8;
-        if offset > prefix_length
-            offset = offset - num_carriers;
-        end
-        if abs(offset) > 5
-            frame_offset = frame_offset + round(offset/4);
-        end
-        
-        if enable_plots>=1
-            figure(3)
-            for itx=1:nant_tx
-                for irx=1:nant_rx
-                    subplot(nant_tx,nant_rx,(itx-1)*nant_rx + irx);
-                    surf(20*log10(abs(Ht(:,:,itx,irx))))
-                    %xlabel('time [OFDM symbol]')
-                    %ylabel('delay time [samples]')
-                    %zlabel('power [dB]')
-                    shading interp
+            for carrier=1:n_carriers
+               if (carrier==1)
+                   transmit_f = transmit_f1;
+                   received_f = received_f1;
+               else
+                   transmit_f = transmit_f2;
+                   received_f = received_f2;
+               end                   
+                        
+            
+            H = zeros(num_symbols_frame/2,p(carrier).useful_carriers/4,p(carrier).nant_tx,p(carrier).nant_rx);
+            for itx=1:p(carrier).nant_tx
+                % f_start and t_start indicate the start of the pilots in time
+                % and frequency according to the specifications (see .doc file).
+                % t_start has to be >=2, since the first symbol is the PSS.
+                f_start = mod(itx-1,2)*2+1;
+                t_start = floor((itx-1)/2)+1;
+                for irx=1:p(carrier).nant_rx
+                    H(:,:,itx,irx)=conj(squeeze(transmit_f(itx,t_start:2:end,f_start:4:end))).*received_f(t_start:2:end,f_start:4:end,irx);
                 end
             end
-            figure(4)
-            for itx=1:nant_tx
-                for irx=1:nant_rx
-                    subplot(nant_tx,nant_rx,(itx-1)*nant_rx + irx);
-                    plot(10*log10(PDP(:,:,itx,irx)))
-                    ylim([50 80])
-                    xlim([0 75])
-                    %xlabel('delay time [samples]')
-                    %ylabel('power [dB]')
+            Ht = ifft(H,[],2);
+            PDP = mean(abs(Ht).^2,1);
+            PDP_all = squeeze(mean(mean(PDP,3),4));
+            %PDP_total((block-1)*nframes+i+1,:,:,:) = PDP;
+                        
+            if enable_plots>=1
+                figure(3+2*(carrier-1))
+                for itx=1:p(carrier).nant_tx
+                    for irx=1:p(1).nant_rx
+                        subplot(p(1).nant_tx,p(1).nant_rx,(itx-1)*p(1).nant_rx + irx);
+                        surf(20*log10(abs(Ht(:,:,itx,irx))))
+                        %xlabel('time [OFDM symbol]')
+                        %ylabel('delay time [samples]')
+                        %zlabel('power [dB]')
+                        shading interp
+                    end
+                end
+                figure(4+2*(carrier-1))
+                for itx=1:p(1).nant_tx
+                    for irx=1:p(1).nant_rx
+                        subplot(p(1).nant_tx,p(1).nant_rx,(itx-1)*p(1).nant_rx + irx);
+                        plot(10*log10(PDP(:,:,itx,irx)))
+                        ylim([50 80])
+                        xlim([0 75])
+                        %xlabel('delay time [samples]')
+                        %ylabel('power [dB]')
+                    end
                 end
+                drawnow
             end
-            drawnow
-        end
+            end
+            
+            % adjust frame offset base on channel estimate to compensate for
+            % timing drift. We try to keep the peak of the impulse response at
+            % sample prefix_length/8.
+            [m,idx] = max(fft(ifft(PDP_all),p(1).num_carriers));
+            offset = idx - p(1).prefix_length/8;
+            if offset > p(1).prefix_length
+                offset = offset - p(1).num_carriers;
+            end
+            if abs(offset) > 5
+                frame_offset = frame_offset + round(offset/4);
+            end
+            
         end
     end
     fprintf(1,'\n');