Index: /issm/trunk-jpl/src/m/plot/radarpower.m
===================================================================
--- /issm/trunk-jpl/src/m/plot/radarpower.m	(revision 21218)
+++ /issm/trunk-jpl/src/m/plot/radarpower.m	(revision 21219)
@@ -20,5 +20,4 @@
 end
 
-geotiff_name = getfieldvalue(options,'geotiff_name','');
 highres = getfieldvalue(options,'highres',0);
 xlim    = getfieldvalue(options,'xlim',[min(md.mesh.x) max(md.mesh.x)]);
@@ -35,133 +34,51 @@
 
 if ~exist(options,'overlay_image'), % no image provided, go look into ModelData for one!{{{
-	if md.mesh.epsg==3413,   %Greenland 
-		%old code {{{ 
-		%if ~exist(['/u/astrid-r1b/ModelData/MOG/mog150_greenland_map.jpg']),
-		%	error(['radarpower error message: file ' '/u/astrid-r1b/ModelData/MOG/mog150_greenland_map.jpg not found.']);
-		%end
-		%name = 'mog150_greenland_map';
-		%name = 'mog100_hp1_v10';
-		%%name = 'mog500_hp1_v10';
-		%jpgim=['/u/astrid-r1b/ModelData/MOG/' name '.jpg'];
-		%geom=load(['/u/astrid-r1b/ModelData/MOG/' name '.jpgw'],'ascii');
-		%%jpgim='/u/astrid-r1b/morlighe/issmjpl/projects/MorlighemGRL2012/Data/Mosaic_amp_asar2010.jpg';
-		%%geom=load('/u/astrid-r1b/morlighe/issmjpl/projects/MorlighemGRL2012/Data/Mosaic_amp_asar2010.jpgw');
-		%jpgim='/u/astrid-r1b/morlighe/issmjpl/projects/MorlighemGRL2012/Data/Russel_asar2010.png';
-		%geom=load('/u/astrid-r1b/morlighe/issmjpl/projects/MorlighemGRL2012/Data/Russel_asar2010.pngw');
+	if exist(options,'geotiff_name'),
+		paths = {getfieldvalue(options,'geotiff_name')};
+	elseif md.mesh.epsg==3031, %Antarctica
+			if highres,
+				paths = {'/u/astrid-r1b/ModelData/MosaicTiffRsat/amm125m_v2_200m.tif','/home/ModelData/Antarctica/MosaicTiffRsat/amm125m_v2_200m.tif'};
+			else
+				paths = {'/u/astrid-r1b/ModelData/MosaicTiffRsat/amm125m_v2_1km.tif','/home/ModelData/Antarctica/MosaicTiffRsat/amm125m_v2_1km.tif'};
+			end
+	elseif md.mesh.epsg==3413,   %Greenland 
+		if highres,
+			paths = {'/u/astrid-r1b/ModelData/MOG/mog100_r2_hp1.tif','/home/ModelData/Greenland/MOG/mog100_r2_hp1.tif'};
+		else
+			paths = {'/u/astrid-r1b/ModelData/MOG/mog500_r2_hp1.tif','/home/ModelData/Greenland/MOG/mog500_r2_hp1.tif'};
+		end
+	else
+		error('Need to provide geotiff for areas outside of Greenland and Antarctica');
+	end
 
-		%%geom:   xposting nbcols nbrows yposting xmin ymax
-		%xmin=max(geom(5),x0);
-		%xmax=min(geom(5)+geom(1)*geom(2),x1);
-		%ymin=max(geom(6)-geom(3)*geom(4),y0);
-		%ymax=min(geom(6),y1);
-
-		%firstcol=max(1,floor((xmin-geom(5))/geom(1))); %x min
-		%firstrow=max(1,floor((geom(6)-ymax)/geom(4))); %y max
-		%numcols=floor((xmax-xmin)/geom(1)); % x posting
-		%numrows=floor((ymax-ymin)/geom(4)); % y posting
-		%pixelskip=max(1,ceil(posting/geom(1)));
-
-		%%Read and crop file
-		%disp('Warning: expecting coordinates in polar stereographic (Std Latitude: 70ºN Meridian: 45º)');
-		%im=imread(jpgim);
-		%im=im(firstrow:firstrow+numrows-1,firstcol:firstcol+numcols-1);
-		%md.radaroverlay.pwr=double(flipud(im(1:pixelskip:end,1:pixelskip:end)));
-		%md.radaroverlay.x=(xmin:(xmax-xmin)/(size(md.radaroverlay.pwr,2)-1):xmax);
-		%md.radaroverlay.y=(ymin:(ymax-ymin)/(size(md.radaroverlay.pwr,1)-1):ymax); % }}}
-		if ~exist(options,'geotiff_name'),
-			if highres,
-				if ~exist(['/u/astrid-r1b/ModelData/MOG/mog100_r2_hp1.tif']),
-					error(['radarpower error message: file ' '/u/astrid-r1b/ModelData/MOG/mog100_r2_hp1.tif not found.']);
-				end
-				geotiff_name=['/u/astrid-r1b/ModelData/MOG/mog100_r2_hp1.tif'];
-			else
-				if ~exist(['/u/astrid-r1b/ModelData/MOG/mog500_r2_hp1.tif']),
-					error(['radarpower error message: file ' '/u/astrid-r1b/ModelData/MOG/mog500_r2_hp1.tif not found.']);
-				end
-				geotiff_name=['/u/astrid-r1b/ModelData/MOG/mog500_r2_hp1.tif'];
-			end
+	%Find file from list
+	found = false;
+	for i=1:numel(paths),
+		if exist(paths{i},'file'),
+			geotiff_name = paths{i}; found = true;
 		end
-
-		%Name of image
-		inputname='./temp.tif';
-		eval(['!gdal_translate -quiet -projwin ' num2str(x0) ' ' num2str(y1) ' ' num2str(x1) ' ' num2str(y0) ' ' geotiff_name ' ' inputname ]);
-
-		%Read in temp.tif:
-		im=imread('temp.tif','TIFF');
-		%adjust contrast and brightness
-		%im=imadjust(im,[a b],[c d]);
-		pixelskip=max(1,ceil(posting/((x1-x0)/(size(im,2)))));
-		if size(im,3)==1,
-			md.radaroverlay.pwr=double(flipud(im(1:pixelskip:end,1:pixelskip:end)));
-		else
-			md.radaroverlay.pwr=double(im(1:pixelskip:end,1:pixelskip:end,1:pixelskip:end));
-			md.radaroverlay.pwr(:,:,1)=flipud(md.radaroverlay.pwr(:,:,1));
-			md.radaroverlay.pwr(:,:,2)=flipud(md.radaroverlay.pwr(:,:,2));
-			md.radaroverlay.pwr(:,:,3)=flipud(md.radaroverlay.pwr(:,:,3));
-		end
-		md.radaroverlay.x=(x0:(x1-x0)/(size(md.radaroverlay.pwr,2)-1):x1);
-		md.radaroverlay.y=(y0:(y1-y0)/(size(md.radaroverlay.pwr,1)-1):y1);
-
-		%Erase image or keep it?
-		if ~getfieldvalue(options,'keep_image',0),
-			system('rm -rf ./temp.tif');
-		end
-	elseif md.mesh.epsg==3031, %Antarctica 
-		if ~exist(options,'geotiff_name'),
-			if highres,
-				if ~exist(['/u/astrid-r1b/ModelData/MosaicTiffRsat/amm125m_v2_200m.tif']),
-					error(['radarpower error message: file ' '/u/astrid-r1b/ModelData/MosaicTiffRsat/amm125m_v2_200m.tif not found.']);
-				end
-				geotiff_name=['/u/astrid-r1b/ModelData/MosaicTiffRsat/amm125m_v2_200m.tif'];
-			else
-				if ~exist(['/u/astrid-r1b/ModelData/MosaicTiffRsat/amm125m_v2_1km.tif']),
-					error(['radarpower error message: file ' '/u/astrid-r1b/ModelData/MosaicTiffRsat/amm125m_v2_1km.tif not found.']);
-				end
-				geotiff_name=['/u/astrid-r1b/ModelData/MosaicTiffRsat/amm125m_v2_1km.tif'];
-			end
-		end
-
-		%Name of image
-		inputname='./temp.tif';
-		eval(['!gdal_translate -quiet -projwin ' num2str(x0) ' ' num2str(y1) ' ' num2str(x1) ' ' num2str(y0) ' ' geotiff_name ' ' inputname ]);
-
-		%Read in temp.tif:
-		im=imread('temp.tif','TIFF');
-		%adjust contrast and brightness
-		%im=imadjust(im,[a b],[c d]);
-		pixelskip=max(1,ceil(posting/((x1-x0)/(size(im,2)))));
-		md.radaroverlay.pwr=double(flipud(im(1:pixelskip:end,1:pixelskip:end)));
-		md.radaroverlay.x=(x0:(x1-x0)/(size(md.radaroverlay.pwr,2)-1):x1);
-		md.radaroverlay.y=(y0:(y1-y0)/(size(md.radaroverlay.pwr,1)-1):y1);
-
-		%Erase image or keep it?
-		if ~getfieldvalue(options,'keep_image',0),
-			system('rm -rf ./temp.tif');
-		end
+	end
+	if ~found,
+		error('could not find radar image'); 
+	end
 
 
-	else
-		if ~exist(options,'geotiff_name'), 
-			error('Need a geotiff for areas outside of Greenland and Antarctica');
-		end
-		
-		%Name of image
-		inputname='./temp.tif';
-		eval(['!gdal_translate -quiet -projwin ' num2str(x0) ' ' num2str(y1) ' ' num2str(x1) ' ' num2str(y0) ' ' geotiff_name ' ' inputname ]);
+	%Crop radar image from xylim
+	filename='./temp.tif';
+	eval(['!gdal_translate -quiet -projwin ' num2str(x0) ' ' num2str(y1) ' ' num2str(x1) ' ' num2str(y0) ' ' geotiff_name ' ' filename ]);
 
-		%Read in temp.tif:
-		im=imread('temp.tif','TIFF');
-		%adjust contrast and brightness
-		%im=imadjust(im,[a b],[c d]);
-		pixelskip=max(1,ceil(posting/((x1-x0)/(size(im,2)))));
-		md.radaroverlay.pwr=double(flipud(im(1:pixelskip:end,1:pixelskip:end)));
-		md.radaroverlay.x=(x0:(x1-x0)/(size(md.radaroverlay.pwr,2)-1):x1);
-		md.radaroverlay.y=(y0:(y1-y0)/(size(md.radaroverlay.pwr,1)-1):y1);
+	%Read in temp.tif:
+	im=imread('temp.tif','TIFF');
+	%adjust contrast and brightness
+	%im=imadjust(im,[a b],[c d]);
+	pixelskip=max(1,ceil(posting/((x1-x0)/(size(im,2)))));
+	md.radaroverlay.pwr=double(flipud(im(1:pixelskip:end,1:pixelskip:end)));
+	md.radaroverlay.x=(x0:(x1-x0)/(size(md.radaroverlay.pwr,2)-1):x1);
+	md.radaroverlay.y=(y0:(y1-y0)/(size(md.radaroverlay.pwr,1)-1):y1);
 
-		%Erase image or keep it?
-		if ~getfieldvalue(options,'keep_image',0),
-			system('rm -rf ./temp.tif');
-		end
-	end 
+	%Erase image or keep it?
+	if ~getfieldvalue(options,'keep_image',0),
+		system('rm -rf ./temp.tif');
+	end
 	%}}}
 else %user provided image {{{
