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

Author: jjacob

README.md

@@ -16,11 +16,8 @@ cd DailyPythonScripts
 # get submodules:
 git submodule init && git submodule update
 
-# setup run:
-./setup.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
@@ -21,9 +21,6 @@ echo "... setting up git submodules"
 time git submodule init && git submodule update
 echo "... extracting ${_CONDOR_JOB_IWD}/dps.tar on top"
 tar -xf ${_CONDOR_JOB_IWD}/dps.tar --overwrite
-echo "... running setup routine"
->&2 "... running setup routine"
-time source setup_with_conda.sh
 echo "... enforcing conda python environment"
 # this is safe, as the dangerous part is only executed on soolin
 source environment_conda.sh