Changeset 648 in ETALON for SPESO

Timestamp:

Apr 3, 2017, 3:59:33 PM (7 years ago)

Author:

hodnevuc

Message:

 

File:

• SPESO/ana2015/analyse_day.m (modified) (6 diffs)

SPESO/ana2015/analyse_day.m

@@ -45 +45 @@
         dayInfo.ch2signalNegPeakLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(2).values.LPM.signalNegPeak;
         
-        dayInfo.ch2signalRMSLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(2).values.LPM.allRMS;
-        dayInfo.ch2signalRMSSPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(2).values.SPM.allRMS;
+        dayInfo.ch2signalRMSLPM1(iShot)=dayInfo.shots(iShot).shotInfo.ch(2).values.LPM.allRMS(1);
+        dayInfo.ch2signalRMSSPM1(iShot)=dayInfo.shots(iShot).shotInfo.ch(2).values.SPM.allRMS(1);
+        dayInfo.ch2signalRMSLPM2(iShot)=dayInfo.shots(iShot).shotInfo.ch(2).values.LPM.allRMS(3);
+        dayInfo.ch2signalRMSSPM2(iShot)=dayInfo.shots(iShot).shotInfo.ch(2).values.SPM.allRMS(3);
+        
 if(((theShot.shotInfo.ch(1).on)==1)&& (~(isempty(theShot.shotInfo.ch(1).values))) && ( strcmp(dateStr,dateStrFile )))
         dayInfo.ch1signalValSPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.SPM.signalVal;
@@ -53 +56 @@
         dayInfo.ch1signalNegPeakLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.LPM.signalNegPeak;
        
-        dayInfo.ch1signalRMSLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.LPM.allRMS;
-        dayInfo.ch1signalRMSSPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.SPM.allRMS;
-
+        dayInfo.ch1signalRMSLPM1(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.LPM.allRMS(1);
+        dayInfo.ch1signalRMSSPM1(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.SPM.allRMS(1);
+        dayInfo.ch1signalRMSLPM2(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.LPM.allRMS(3);
+        dayInfo.ch1signalRMSSPM2(iShot)=dayInfo.shots(iShot).shotInfo.ch(1).values.SPM.allRMS(3);
 end % if ch(1) is on 
 
@@ -64 +68 @@
         dayInfo.ch3signalNegPeakLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(3).values.LPM.signalNegPeak;
         
-        dayInfo.ch3signalRMSLPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(3).values.LPM.allRMS;
-        dayInfo.ch3signalRMSSPM(iShot)=dayInfo.shots(iShot).shotInfo.ch(3).values.SPM.allRMS;
+        dayInfo.ch3signalRMSLPM1(iShot)=dayInfo.shots(iShot).shotInfo.ch(3).values.LPM.allRMS(1);
+        dayInfo.ch3signalRMSSPM1(iShot)=dayInfo.shots(iShot).shotInfo.ch(3).values.SPM.allRMS(1);
+        dayInfo.ch3signalRMSLPM2(iShot)=dayInfo.shots(iShot).shotInfo.ch(3).values.LPM.allRMS(3);
+        dayInfo.ch3signalRMSSPM2(iShot)=dayInfo.shots(iShot).shotInfo.ch(3).values.SPM.allRMS(3);
 end % if ch(3) is on 
         hourStr=line(16:21);
@@ -108 +114 @@
         dayFullInfo.ch2signalNegPeakLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(2).values.LPM.signalNegPeak;
         
-dayFullInfo.ch2signalRMSLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(2).values.LPM.allRMS;
-dayFullInfo.ch2signalRMSSPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(2).values.SPM.allRMS;
+dayFullInfo.ch2signalRMSLPM1(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(2).values.LPM.allRMS(1);
+dayFullInfo.ch2signalRMSSPM1(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(2).values.SPM.allRMS(1);
+dayFullInfo.ch2signalRMSLPM2(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(2).values.LPM.allRMS(3);
+dayFullInfo.ch2signalRMSSPM2(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(2).values.SPM.allRMS(3);
+
 if((theShot.shotInfo.ch(1).on)==1)
   if  (~(isempty(theShot.shotInfo.ch(1).values)))
@@ -116 +125 @@
         dayFullInfo.ch1signalValLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.LPM.signalVal;
         dayFullInfo.ch1signalNegPeakLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.LPM.signalNegPeak;
-        dayFullInfo.ch1signalRMSLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.LPM.allRMS;
-        dayFullInfo.ch1signalRMSSPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.SPM.allRMS;
+        
+        dayFullInfo.ch1signalRMSLPM1(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.LPM.allRMS(1);
+        dayFullInfo.ch1signalRMSSPM1(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.SPM.allRMS(1);
+        dayFullInfo.ch1signalRMSLPM2(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.LPM.allRMS(3);
+        dayFullInfo.ch1signalRMSSPM2(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(1).values.SPM.allRMS(3);
         else % shot is empty
                  error_sp(['Empty channel 1 shot on ' dateStr ' shot number ' num2str(iFullShot) ])
@@ -129 +141 @@
         dayFullInfo.ch3signalValLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.LPM.signalVal;
         dayFullInfo.ch3signalNegPeakLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.LPM.signalNegPeak;
-        dayFullInfo.ch3signalRMSLPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.LPM.allRMS;
-        dayFullInfo.ch3signalRMSSPM(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.SPM.allRMS;
+        dayFullInfo.ch3signalRMSLPM1(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.LPM.allRMS(1);
+        dayFullInfo.ch3signalRMSSPM1(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.SPM.allRMS(1);
+        dayFullInfo.ch3signalRMSLPM2(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.LPM.allRMS(3);
+        dayFullInfo.ch3signalRMSSPM2(iFullShot)=dayFullInfo.shots(iFullShot).shotInfo.ch(3).values.SPM.allRMS(3);
         else % shot is empty
                  error_sp(['Empty channel 3 shot on ' dateStr ' shot number ' num2str(iFullShot) ])