8magsvn – Diff between revs 35 and 40

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 35 Rev 40
Line 1... Line -...
1 <<<<<<< .mine -  
2 <<<<<<< .mine -  
3 set xrange [500:10000] -  
4 ======= -  
5 set xrange [4000:17000] -  
6 ======= -  
7 set xrange [1000:46000] 1 set xrange [15000:35000]
8 >>>>>>> .r33 -  
9 >>>>>>> .r29 -  
10 #set yrange [0:20] 2 #set yrange [0:20]
11 set autoscale y 3 set autoscale y
12 set style data lines 4 set style data lines
13 set key off 5 set key off
14 <<<<<<< .mine -  
15 <<<<<<< .mine -  
16 #!sshpass -paaaaaa scp root@192.168.15.18:/tmp/sidspec . -  
17 plot '/tmp/sidspec' using 1:2, '/tmp/sidspec' using 1:3 -  
18 pause 1 -  
19 ======= -  
20 #!sshpass -paaaaaa scp root@192.168.15.18:/tmp/sidspec . -  
21   -  
22 plot '/tmp/sidspect' using 1:2, '' using 1:3 -  
23 pause 10 -  
24 ======= -  
25 #!sshpass -paaaaaa scp root@192.168.15.18:/tmp/sidspec . 6 #!sshpass -paaaaaa scp root@192.168.15.18:/tmp/sidspec .
26 plot '/tmp/sidspec' using 1:2, '/tmp/sidspec' using 1:3 7 plot '/tmp/sidspec' using 1:2, '/tmp/sidspec' using 1:3
27 pause 5 8 pause 5
28 >>>>>>> .r33 -  
29 >>>>>>> .r29 -  
30 reread 9 reread