Merge pull request #25 from wyeck-usgs/working

Azimuthal Gap Down-Weighting option for local grids

glasscore/glasslib/include/Hypo.h

@@ -81,7 +81,8 @@ class CHypo {
 			std::string web, double bayes, double thresh, int cut,
 			std::shared_ptr<traveltime::CTravelTime> firstTrav,
 			std::shared_ptr<traveltime::CTravelTime> secondTrav,
-			std::shared_ptr<traveltime::CTTT> ttt, double resolution = 100);
+			std::shared_ptr<traveltime::CTTT> ttt, double resolution = 100,
+			double aziTaper = 360.);
 
 	/**
 	 * \brief CHypo alternate constructor
@@ -148,7 +149,7 @@ class CHypo {
 					std::shared_ptr<traveltime::CTravelTime> firstTrav,
 					std::shared_ptr<traveltime::CTravelTime> secondTrav,
 					std::shared_ptr<traveltime::CTTT> ttt, double resolution =
-							100);
+					100, double aziTap = 360.);
 
 	/**
 	 * \brief Add pick reference to this hypo
@@ -478,6 +479,15 @@ class CHypo {
 									double tStart, double tStop, int nucleate =
 											0);
 
+	/**
+	 * Calculates azimuthal gap for a proposed location
+	 *
+	 * \param lat - latitude of test location
+	 * \param lon - longitude of test location
+	 * \param z - depth of test location
+	 */
+	double gap(double lat, double lon, double z);
+
 	/**
 	 * Gets the stack of associated arrivals at location
 	 *
@@ -549,6 +559,12 @@ class CHypo {
 	 */
 	void trap();
 
+	/**
+	 * \brief aziTaper
+	 * \return the aziTaper
+	 */
+	double getAziTaper() const;
+
 	/**
 	 * \brief Latitude getter
 	 * \return the latitude
@@ -853,6 +869,11 @@ class CHypo {
 	 */
 	double searchVals[5];
 
+	/**
+	 * \brief where to taper bayesVal from azi gap
+	 */
+	double aziTaper;
+
 	/**
 	 * \brief An integer value containing this hypo's processing cycle count
 	 */

glasscore/glasslib/include/Web.h

@@ -92,7 +92,7 @@ class CWeb {
 			std::shared_ptr<traveltime::CTravelTime> firstTrav,
 			std::shared_ptr<traveltime::CTravelTime> secondTrav,
 			int numThreads = 0, int sleepTime = 100,
-			int checkInterval = 60);
+			int checkInterval = 60, double aziTaper = 360.);
 
 	/**
 	 * \brief CWeb destructor
@@ -157,7 +157,8 @@ class CWeb {
 					int numNucleate, int resolution, int numRows, int numCols,
 					int numZ, bool update,
 					std::shared_ptr<traveltime::CTravelTime> firstTrav,
-					std::shared_ptr<traveltime::CTravelTime> secondTrav);
+					std::shared_ptr<traveltime::CTravelTime> secondTrav,
+					double aziTap);
 
 	/**
 	 * \brief Generate a local detection grid
@@ -338,6 +339,13 @@ class CWeb {
 	 */
 	void addJob(std::function<void()> newjob);
 
+	/**
+	 * \brief aziTapre Getter
+	 * \return double with the azi taper start
+	 */
+	double getAziTaper() const;
+
+
 	/**
 	 * \brief CGlass getter
 	 * \return the CGlass pointer
@@ -495,6 +503,12 @@ class CWeb {
 	 */
 	double dResolution;
 
+	/**
+	 * \brief A double which describes where the locator should start
+	 * down weighting for azimuthal gap
+	**/
+	double aziTaper = 360.;
+
 	/**
 	 * \brief A boolean flag that stores whether to update this web when a
 	 * station has changed.