Changeset 633

Timestamp:

Jan 17, 2012, 9:16:13 AM (12 years ago)

Author:

campagne

Message:

merging rev. jec+as

File:

• BAORadio/AmasNancay/trunk/plotRawDiffOnOff.pic (modified) (4 diffs)

BAORadio/AmasNancay/trunk/plotRawDiffOnOff.pic

@@ -19 +19 @@
 
 set path "/sps/baoradio/AmasNancay/AST"
+
 if ( $gain == "0" ) then
   openppf ${path}/rawOnOffDiffNoGain_${source}-${ncycles}Cycles.ppf
@@ -34 +35 @@
 endif
 
-<<<<<<< .mine
 # Abell 1205, 600, 750 cycles
 if ( ${source} == "abell1205" ) then
@@ -45 +45 @@
   endif
 endif
-=======
-set path "/sps/baoradio/AmasNancay/JEC"
-openppf ${path}/rawOnOffDiff_${source}-${ncycles}Cycles.ppf
->>>>>>> .r630
 
 # Abell 2440, 210 cycles
@@ -63 +59 @@
   set packVal "1 10 25 50 100 260"
 endif
+
 
 echo "f1420low=${f1420low}, f1420high=${f1420high}"