Changeset 81 in ETALON for SPESO/analysis

Timestamp:

Apr 4, 2014, 1:11:10 AM (10 years ago)

Author:

delerue

Message:

Changed path in some parts of the analysis code

Location:

SPESO/analysis

Files:

• addSPESOpath.m (added)
• analyseDataRange.m (modified) (1 diff)
• analyseDay.m (modified) (4 diffs)
• analyseFile.m (modified) (1 diff)
• makefile (modified) (1 diff)
• makefile.day (modified) (2 diffs)

SPESO/analysis/analyseDataRange.m

@@ -4 +4 @@
 
 function analyseDataRange(dirname,time_start_of_range,time_end_of_range)
-
-base_save_file_name= [ dirname '/' 'data_' dirname '_from_' time_start_of_range '_to_' time_end_of_range ];
+    addSPESOpath
+    basedir='/sps/sera/delerue/smith-purcell/SPESO/data/';
+    cd(basedir)
+    
+base_save_file_name= [  dirname '/' 'data_' dirname '_from_' time_start_of_range '_to_' time_end_of_range ];
 mat_save_file=[base_save_file_name '_save.mat' ];
 %%% End of parameters

SPESO/analysis/analyseDay.m

@@ -1 +1 @@
 function analyseDay(dirname)
 %dirname='20140202';
+
+basedir='/sps/sera/delerue/smith-purcell/SPESO/data/';
+    addSPESOpath
 
 for iloop=0:23
@@ -6 +9 @@
     hourStart=[ num2str(iloop,'%02d') '-' num2str(0+(3*halfHour)) '0-00'];
     hourEnd=[ num2str(iloop,'%02d') '-' num2str(29+(30*halfHour)) '-59'];
-    range_file_name= [ dirname '/' 'data_' dirname '_from_' ...
+    range_file_name= [ basedir dirname '/' 'data_' dirname '_from_' ...
                         hourStart '_to_' hourEnd '_save.range' ];
     fid=fopen(range_file_name,'w');
@@ -23 +26 @@
     hourStart=[ num2str(iloop,'%02d') '-' num2str(0+(3*halfHour)) '0-00'];
     hourEnd=[ num2str(iloop,'%02d') '-' num2str(29+(30*halfHour)) '-59'];
-    base_save_file_name= [ dirname '/' 'data_' dirname '_from_' hourStart '_to_' hourEnd ];
+    base_save_file_name= [  basedir  dirname '/' 'data_' dirname '_from_' hourStart '_to_' hourEnd ];
         
     loadname=[base_save_file_name '_save.mat' ]
@@ -46 +49 @@
 
 rangeInfo=[ 'Data from ' dirname ' (full day) ' ];
-base_save_file_name= [ dirname '/' 'data_' dirname '_full_day' ];
+base_save_file_name= [ basedir   dirname '/' 'data_' dirname '_full_day' ];
 plotRange(rangeInfo,accData,nFiles,accSignals,base_save_file_name);
    save([base_save_file_name '_save.mat' ],'nFiles','dirname','allData','allSignals');

SPESO/analysis/analyseFile.m

@@ -5 +5 @@
 
 function [data,rateValue,timeCorrection]=analyseFile(fname)
-basename='./';
+basename='/sps/sera/delerue/smith-purcell/SPESO/data/';
 
 %%% Check if the file name starts with the directory

SPESO/analysis/makefile

@@ -12 +12 @@
 %_summary_day.html:
         echo $< to $@ 
-        cd $(subst _summary_day.html,,$@) && pwd && gmake  -f ../makefile.day  ranges && gmake  -f ../makefile.day  SUMMARY_DAY
+        cd $(subst _summary_day.html,,$@) && pwd && gmake  -f ../analysis/makefile.day  ranges && gmake  -f ../analysis/makefile.day  SUMMARY_DAY
 
 

SPESO/analysis/makefile.day

@@ -14 +14 @@
 %_channel_16.png: %_dec.txt.gz
         echo $< to $@ 
-        cd /sps/sera/delerue/smith-purcell/SPESO/data/ && /lal/MatLab/R2013A/bin/matlab -nodisplay -r "analyseFile('$<'),exit"
+        cd /sps/sera/delerue/smith-purcell/SPESO/data/analysis/ && /lal/MatLab/R2013A/bin/matlab -nodisplay -r "analyseFile('$<'),exit"
 
 %.mat: %.range
         echo $< to $@ 
-        cd /sps/sera/delerue/smith-purcell/SPESO/data/ && /lal/MatLab/R2013A/bin/matlab -nodisplay -r "analyseDataRangeRangename('$<'),exit"
+        cd /sps/sera/delerue/smith-purcell/SPESO/data/analysis/ && /lal/MatLab/R2013A/bin/matlab -nodisplay -r "analyseDataRangeRangename('$<'),exit"
 
 %_save.html: %_save.mat
-        /sps/sera/delerue/smith-purcell/SPESO/data/mkRangeSummary.sh $@ 
+        /sps/sera/delerue/smith-purcell/SPESO/data/analysis/mkRangeSummary.sh $@ 
 
 %_dec.html: %_channel_16.png
-        /sps/sera/delerue/smith-purcell/SPESO/data/mkDataSummary.sh $@ 
+        /sps/sera/delerue/smith-purcell/SPESO/data/analysis/mkDataSummary.sh $@ 
 
 data_$(DAY_SAVE)_full_day_save.mat:
-        cd /sps/sera/delerue/smith-purcell/SPESO/data/ && /lal/MatLab/R2013A/bin/matlab -nodisplay -r "analyseDay('$(DAY_SAVE)'),exit"
+        cd /sps/sera/delerue/smith-purcell/SPESO/data/analysis/ && /lal/MatLab/R2013A/bin/matlab -nodisplay -r "analyseDay('$(DAY_SAVE)'),exit"
 
 
@@ -34 +34 @@
 $(DAY_SAVE)_summary_day.html: data_$(DAY_SAVE)_full_day_save.mat ranges
         echo $< to $@ 
-        ../mkDaySummary.sh $(DAY_SAVE)
+        ../analysis/mkDaySummary.sh $(DAY_SAVE)