Skip to content

Commit 13eec5b

Browse files
HolgerPollyNetHolgerPollyNet
committed
cleaned up
1 parent 2469821 commit 13eec5b

2 files changed

Lines changed: 4 additions & 24 deletions

File tree

‎lib/interface/picassoProcV3.m‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1771,10 +1771,7 @@
17711771
sig355RR = squeeze(sum(data.signal(flag355RR, :, flagClFre), 3));
17721772
bg355RR = squeeze(sum(data.bg(flag355RR, :, flagClFre), 3));
17731773

1774-
%[thisAerExt355_raman, thisAerExtStd355_raman] = pollyRamanExt_smart_MC(data.distance0, sig387, 355, 387, mExt355(iGrp,:), mExt387(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_355, 'moving',15,bg387);
17751774
[thisAerExt355_RR,thisAerExtStd355_RR] = pollyRamanExt_smart_MC(data.distance0, sig355RR, 355, 355, mExt355(iGrp,:), mExt355(iGrp,:),number_density(iGrp, :), PollyConfig.angstrexp,PollyConfig.smoothWin_raman_355, 'moving',15,bg355RR);
1776-
%thisAerExt355_RR = pollyRamanExt(data.distance0, sig355RR, 355, 355, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_355, 380, 70, 'moving');
1777-
%thisAerExtStd355_RR = pollyRamanExtStd(data.distance0, sig355RR, bg355RR, 355, 355, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_355, 380, 70, 15);
17781775
data.aerExt355_RR(iGrp, :) = thisAerExt355_RR;
17791776
data.aerExtStd355_RR(iGrp, :) = thisAerExtStd355_RR;
17801777

@@ -1901,10 +1898,7 @@
19011898
sig1064RR = squeeze(sum(data.signal(flag1064RR, :, flagClFre), 3));
19021899
bg1064RR = squeeze(sum(data.bg(flag1064RR, :, flagClFre), 3));
19031900

1904-
%[thisAerExt355_raman, thisAerExtStd355_raman] = pollyRamanExt_smart_MC(data.distance0, sig387, 355, 387, mExt355(iGrp,:), mExt387(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_355, 'moving',15,bg387);
1905-
[thisAerExt1064_RR,thisAerExtStd1064_RR] = pollyRamanExt_smart_MC(data.distance0, sig1064RR, 1064, 1058, mExt1064(iGrp,:), mExt1058(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_1064, 'moving',15,bg1064RR);
1906-
%thisAerExt1064_RR = pollyRamanExt(data.distance0, sig1064RR, 1064, 1064, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_1064, 380, 70, 'moving');
1907-
%thisAerExtStd1064_RR = pollyRamanExtStd(data.distance0, sig1064RR, bg1064RR, 1064, 1064, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_1064, 380, 70, 15);
1901+
[thisAerExt1064_RR,thisAerExtStd1064_RR] = pollyRamanExt_smart_MC(data.distance0, sig1064RR, 1064, 1058, mExt1064(iGrp,:), mExt1058(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_1064, 'moving',15,bg1064RR);
19081902
data.aerExt1064_RR(iGrp, :) = thisAerExt1064_RR;
19091903
data.aerExtStd1064_RR(iGrp, :) = thisAerExtStd1064_RR;
19101904

@@ -1982,10 +1976,7 @@
19821976
sig387 = squeeze(sum(data.signal(flag387NR, :, flagClFre), 3));
19831977
bg387 = squeeze(sum(data.bg(flag387NR, :, flagClFre), 3));
19841978

1985-
%[thisAerExt355_raman, thisAerExtStd355_raman] = pollyRamanExt_smart_MC(data.distance0, sig387, 355, 387, mExt355(iGrp,:), mExt387(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_355, 'moving',15,bg387);
19861979
[thisAerExt355_NR_raman,thisAerExtStd355_NR_raman] = pollyRamanExt_smart_MC(data.distance0, sig387, 355, 387, mExt355(iGrp,:), mExt387(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_NR_355, 'moving',15,bg387);
1987-
%thisAerExt355_NR_raman = pollyRamanExt(data.distance0, sig387, 355, 387, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_NR_355, 380, 70, 'moving');
1988-
%thisAerExtStd355_NR_raman = pollyRamanExtStd(data.distance0, sig387, bg387, 355, 387, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_NR_355, 380, 70, 15);
19891980
data.aerExt355_NR_raman(iGrp, :) = thisAerExt355_NR_raman;
19901981
data.aerExtStd355_NR_raman(iGrp, :) = thisAerExtStd355_NR_raman;
19911982

@@ -2072,10 +2063,7 @@
20722063
sig607 = squeeze(sum(data.signal(flag607NR, :, flagClFre), 3));
20732064
bg607 = squeeze(sum(data.bg(flag607NR, :, flagClFre), 3));
20742065

2075-
%[thisAerExt355_raman, thisAerExtStd355_raman] = pollyRamanExt_smart_MC(data.distance0, sig387, 355, 387, mExt355(iGrp,:), mExt387(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_355, 'moving',15,bg387);
2076-
[thisAerExt532_NR_raman,thisAerExtStd532_NR_raman] = pollyRamanExt_smart_MC(data.distance0, sig607, 532, 607, mExt532(iGrp,:), mExt607(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_NR_532, 'moving',15,bg607);
2077-
%thisAerExt532_NR_raman = pollyRamanExt(data.distance0, sig607, 532, 607, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_NR_532, 380, 70, 'moving');
2078-
thisAerExtStd532_NR_raman = pollyRamanExtStd(data.distance0, sig607, bg607, 532, 607, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_NR_532, 380, 70, 15);
2066+
[thisAerExt532_NR_raman, thisAerExtStd532_NR_raman] = pollyRamanExt_smart_MC(data.distance0, sig607, 532, 607, mExt532(iGrp,:), mExt607(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_NR_532, 'moving',15,bg607);
20792067
data.aerExt532_NR_raman(iGrp, :) = thisAerExt532_NR_raman;
20802068
data.aerExtStd532_NR_raman(iGrp, :) = thisAerExtStd532_NR_raman;
20812069

@@ -2513,10 +2501,7 @@
25132501
sig387 = transpose(squeeze(sum(sigOLCor387(:, flagClFre), 2)));
25142502
bg387 = transpose(squeeze(sum(bgOLCor387(:, flagClFre), 2)));
25152503

2516-
%[thisAerExt355_raman, thisAerExtStd355_raman] = pollyRamanExt_smart_MC(data.distance0, sig387, 355, 387, mExt355(iGrp,:), mExt387(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_355, 'moving',15,bg387);
25172504
[thisAerExt355_OC_raman,thisAerExtStd355_OC_raman] = pollyRamanExt_smart_MC(data.distance0, sig387, 355, 387, mExt355(iGrp,:), mExt387(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_355, 'moving',15,bg387);
2518-
%thisAerExt355_OC_raman = pollyRamanExt(data.distance0, sig387, 355, 387, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_355, 380, 70, 'moving');
2519-
%thisAerExtStd355_OC_raman = pollyRamanExtStd(data.distance0, sig387, bg387, 355, 387, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_355, 380, 70, 15);
25202505
data.aerExt355_OC_raman(iGrp, :) = thisAerExt355_OC_raman;
25212506
data.aerExtStd355_OC_raman(iGrp, :) = thisAerExtStd355_OC_raman;
25222507

@@ -2581,10 +2566,7 @@
25812566
sig607 = transpose(squeeze(sum(sigOLCor607(:, flagClFre), 2)));
25822567
bg607 = transpose(squeeze(sum(bgOLCor607(:, flagClFre), 2)));
25832568

2584-
%[thisAerExt355_raman, thisAerExtStd355_raman] = pollyRamanExt_smart_MC(data.distance0, sig387, 355, 387, mExt355(iGrp,:), mExt387(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_355, 'moving',15,bg387);
25852569
[thisAerExt532_OC_raman,thisAerExtStd532_OC_raman] = pollyRamanExt_smart_MC(data.distance0, sig607, 532, 607, mExt532(iGrp,:), mExt607(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_532, 'moving',15,bg607);
2586-
%thisAerExt532_OC_raman = pollyRamanExt(data.distance0, sig607, 532, 607, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_532, 380, 70, 'moving');
2587-
%thisAerExtStd532_OC_raman = pollyRamanExtStd(data.distance0, sig607, bg607, 532, 607, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_532, 380, 70, 15);
25882570
data.aerExt532_OC_raman(iGrp, :) = thisAerExt532_OC_raman;
25892571
data.aerExtStd532_OC_raman(iGrp, :) = thisAerExtStd532_OC_raman;
25902572

@@ -2649,11 +2631,8 @@
26492631
sig607 = transpose(squeeze(sum(sigOLCor607(:, flagClFre), 2)));
26502632
bg607 = transpose(squeeze(sum(bgOLCor607(:, flagClFre), 2)));
26512633

2652-
%[thisAerExt355_raman, thisAerExtStd355_raman] = pollyRamanExt_smart_MC(data.distance0, sig387, 355, 387, mExt355(iGrp,:), mExt387(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_355, 'moving',15,bg387);
26532634
[thisAerExt1064_OC_raman,thisAerExtStd1064_OC_raman] = pollyRamanExt_smart_MC(data.distance0, sig607, 532, 607, mExt532(iGrp,:), mExt607(iGrp,:), number_density(iGrp, :), PollyConfig.angstrexp, PollyConfig.smoothWin_raman_1064, 'moving',15,bg607);
26542635
thisAerExt1064_OC_raman = thisAerExt1064_OC_raman / (1064/532).^PollyConfig.angstrexp;
2655-
%thisAerExt1064_OC_raman = pollyRamanExt(data.distance0, sig607, 1064, 607, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_1064, 380, 70, 'moving');
2656-
%thisAerExtStd1064_OC_raman = pollyRamanExtStd(data.distance0, sig607, bg607, 1064, 607, PollyConfig.angstrexp, data.pressure(iGrp, :), data.temperature(iGrp, :) + 273.17, PollyConfig.smoothWin_raman_1064, 380, 70, 15);
26572636
data.aerExt1064_OC_raman(iGrp, :) = thisAerExt1064_OC_raman;
26582637
data.aerExtStd1064_OC_raman(iGrp, :) = thisAerExtStd1064_OC_raman;
26592638

‎lib/qc/pollyOLCor.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@
150150
height, height(p.Results.normRange));
151151
bgOLCor = sigGlue(bgFR, p.Results.bgNR, p.Results.signalRatio, height, height(p.Results.normRange));
152152
end
153-
153+
case 4
154+
% signal gleuing according to maria T script
154155

155156
otherwise
156157
error('Unknown overlap correction mode %d', p.Results.overlapCorMode);

0 commit comments

Comments
 (0)