Changeset 646 in ETALON
- Timestamp:
- Apr 3, 2017, 3:39:53 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
SPESO/ana2015/analyse_day.m
r644 r646 44 44 dayInfo.ch2signalValLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(2).values.LPM.signalVal; 45 45 dayInfo.ch2signalNegPeakLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(2).values.LPM.signalNegPeak; 46 46 47 dayInfo.ch2signalRMSLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(2).values.LPM.allRMS; 48 dayInfo.ch2signalRMSSPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(2).values.SPM.allRMS; 47 49 if(((theShot.shotInfo.ch(1).on)==1)&& (~(isempty(theShot.shotInfo.ch(1).values))) && ( strcmp(dateStr,dateStrFile ))) 48 50 dayInfo.ch1signalValSPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.SPM.signalVal; … … 50 52 dayInfo.ch1signalValLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.LPM.signalVal; 51 53 dayInfo.ch1signalNegPeakLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.LPM.signalNegPeak; 54 55 dayInfo.ch1signalRMSLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.LPM.allRMS; 56 dayInfo.ch1signalRMSSPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.SPM.allRMS; 57 52 58 end % if ch(1) is on 53 59 … … 57 63 dayInfo.ch3signalValLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(3).values.LPM.signalVal; 58 64 dayInfo.ch3signalNegPeakLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(3).values.LPM.signalNegPeak; 65 66 dayInfo.ch3signalRMSLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(3).values.LPM.allRMS; 67 dayInfo.ch3signalRMSSPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(3).values.SPM.allRMS; 59 68 end % if ch(3) is on 60 69 hourStr=line(16:21); … … 98 107 dayFullInfo.ch2signalValLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(2).values.LPM.signalVal; 99 108 dayFullInfo.ch2signalNegPeakLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(2).values.LPM.signalNegPeak; 100 109 110 dayFullInfo.ch2signalRMSLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(2).values.LPM.allRMS; 111 dayFullInfo.ch2signalRMSSPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(2).values.SPM.allRMS; 101 112 if((theShot.shotInfo.ch(1).on)==1) 102 113 if (~(isempty(theShot.shotInfo.ch(1).values))) … … 105 116 dayFullInfo.ch1signalValLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.LPM.signalVal; 106 117 dayFullInfo.ch1signalNegPeakLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.LPM.signalNegPeak; 118 dayFullInfo.ch1signalRMSLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.LPM.allRMS; 119 dayFullInfo.ch1signalRMSSPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.SPM.allRMS; 107 120 else % shot is empty 108 121 error_sp(['Empty channel 1 shot on ' dateStr ' shot number ' num2str(iFullShot) ]) … … 116 129 dayFullInfo.ch3signalValLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.LPM.signalVal; 117 130 dayFullInfo.ch3signalNegPeakLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.LPM.signalNegPeak; 131 dayFullInfo.ch3signalRMSLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.LPM.allRMS; 132 dayFullInfo.ch3signalRMSSPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.SPM.allRMS; 118 133 else % shot is empty 119 134 error_sp(['Empty channel 3 shot on ' dateStr ' shot number ' num2str(iFullShot) ])
Note: See TracChangeset
for help on using the changeset viewer.