Describir: Improving Productivity of an Upland Rice and Maize System: Farmer Cropping Choices Or Researcher Cropping Pattern Trapezoids?