Merge pull request #1533 from RosettaCommons/rfalford12/extend-mpdock…

…-rscript-interface

Extend the MPDock parse_my_tag function

Add options to MPDock's parse_my_tag to set alternate low & high resolution score functions from the RosettaScripts interface

Old repository SHA1: f7ed5793479fe7814557fb0423e4be40f4b4d9ab

source/src/protocols/docking/membrane/MPDockingMover.cc

@@ -148,6 +148,18 @@ MPDockingMover::parse_my_tag(
 	core::pose::Pose const &
 ) {
 
+	using namespace core::scoring; 
+	using namespace std; 
+
+	// Set weights for the low & high resolution score functions from the command line
+	if ( tag->hasOption( "cen_sfxn_weights" ) ) {
+		lowres_scorefxn_ = ScoreFunctionFactory::create_score_function( tag->getOption< string >( "cen_sfxn_weights" ) ); 
+	}
+
+	if ( tag->hasOption( "fa_sfxn_weights" ) ) {
+		highres_scorefxn_ = ScoreFunctionFactory::create_score_function( tag->getOption< string >( "fa_sfxn_weights" ) ); 
+	}
+
 	// Read in membrane center & normal
 	if ( tag->hasOption( "center" ) ) {
 		std::string center = tag->getOption< std::string >( "center" );