Changeset 619 in ETALON for SPESO

Timestamp:

Sep 30, 2016, 11:59:01 AM (8 years ago)

Author:

delerue

Message:

Changed the data loading procedure

Location:

SPESO/ana2015

Files:

• get_parameters.m (modified) (1 diff)
• load_analysis_data.m (modified) (3 diffs)

SPESO/ana2015/get_parameters.m

@@ -3 +3 @@
   dateNum=str2double(dateStr);
   hourNum=str2double(hourStr);
-if (dateNum>=20160905)
+if (dateNum>=20170101)
   error_sp([ 'NO parameters defined on ' dateStr ]);
+elseif (dateNum>=20160801)
+  myParameters.ch(1).on=1;
+  
+  myParameters.ch(1).SPM.sigStart=-0.64e-7;
+  myParameters.ch(1).SPM.sigEnd=-0.52e-7;
+  myParameters.ch(1).SPM.riseTime=2.0e-8;
+
+  myParameters.ch(1).LPM.sigStart=-1e-8;
+  myParameters.ch(1).LPM.sigEnd=1e-8;
+  myParameters.ch(1).LPM.riseTime=1e-8;
+
+  myParameters.ch(2).on=1;
+  
+  myParameters.ch(2).SPM.sigStart=-0.73e-7;
+  myParameters.ch(2).SPM.sigEnd=-0.61e-7;
+  myParameters.ch(2).SPM.riseTime=2.0e-8;
+
+  myParameters.ch(2).LPM.sigStart=-1e-8;
+  myParameters.ch(2).LPM.sigEnd=1e-8;
+  myParameters.ch(2).LPM.riseTime=1e-8;
+
+  myParameters.ch(3).on=0;
+  myParameters.ch(4).on=0;
+elseif (dateNum>=20160910)
+  myParameters.ch(1).on=1;
+  
+  myParameters.ch(1).SPM.sigStart=-0.64e-7;
+  myParameters.ch(1).SPM.sigEnd=-0.52e-7;
+  myParameters.ch(1).SPM.riseTime=2.0e-8;
+
+  myParameters.ch(1).LPM.sigStart=-1e-8;
+  myParameters.ch(1).LPM.sigEnd=1e-8;
+  myParameters.ch(1).LPM.riseTime=1e-8;
+
+  myParameters.ch(2).on=1;
+  
+  myParameters.ch(2).SPM.sigStart=-0.73e-7;
+  myParameters.ch(2).SPM.sigEnd=-0.61e-7;
+  myParameters.ch(2).SPM.riseTime=2.0e-8;
+
+  myParameters.ch(2).LPM.sigStart=-1e-8;
+  myParameters.ch(2).LPM.sigEnd=1e-8;
+  myParameters.ch(2).LPM.riseTime=1e-8;
+
+  myParameters.ch(3).on=1;
+  
+  myParameters.ch(3).SPM.sigStart=-0.73e-7;
+  myParameters.ch(3).SPM.sigEnd=-0.61e-7;
+  myParameters.ch(3).SPM.riseTime=0.5e-8;
+
+  myParameters.ch(3).LPM.sigStart=-1e-8;
+  myParameters.ch(3).LPM.sigEnd=1e-8;
+  myParameters.ch(3).LPM.riseTime=1e-8;
+
+
+  myParameters.ch(4).on=0;
+
 elseif (dateNum>=20160101)
   myParameters.ch(1).on=1;

SPESO/ana2015/load_analysis_data.m

@@ -8 +8 @@
 fprintf('Number of arguments: %d\n',nargin)
 
+force=0;
+reload=1;
+
 if (nargin>0)
 lsmask=varargin{1};
 else
-lsmask='2015????_scope/*.dayFullInfo';
+lsmask='2016????_scope/*.dayFullInfo';
 end 
 
+if (nargin>=2)
+  if (strcmpi(varargin{2},'-f')==1)
+    force=1;
+  end
+end
+
 display(['lmask: ' lsmask])
 
+  if (exist('allData'))
+    if (strcmp(lsmask,allData.lsmask)==1)
+      disp('Mask already loaded')
+        reload=0;
+    end
+  end
+
+if ((reload==1)||(force==1))
 
   loadFullInfo=1;
@@ -40 +57 @@
 newLines=[ 0 newLines ];
 allData=[];
+allData.lsmask=lsmask;
 allData.hoursNum=[ ];
 allData.dayNum=[ ];
@@ -185 +203 @@
 dayData.nShots=newnShots;
 dayData.nFullShots=newnFullShots;
-
+ end %reload==1
 end %function