Updating condor/run.sh and README.md to use environment_conda.sh and setup_with_conda.sh in setup of DPS.

Author: jjacob

README.md

@@ -16,11 +16,11 @@ cd DailyPythonScripts
 # get submodules:
 git submodule init && git submodule update
 
-# setup run:
-./setup.sh
+# setup environment (using virtualenv for python):
+./setup_with_conda.sh
 
 # setup environment (using virtualenv for python):
-source environment.sh
+source environment_conda.sh
 
 # make sure matplotlib is up to date (should return 1.3.1 or above):
 python -c 'import matplotlib; print matplotlib.__version__'

condor/run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 cmssw_version=CMSSW_7_4_7
-git_branch=master
+git_branch=run1
 echo "Setting up ${cmssw_version} ..."
 echo "... sourcing CMS default environment from CVMFS"
 source /cvmfs/cms.cern.ch/cmsset_default.sh