From ce81ffdc447cab680159aa0e6f7555a3f73f58c1 Mon Sep 17 00:00:00 2001
From: David Chamont <sha1-cc2cbd4cf572176bc632dcdb55d943ce51d4e6af@cern.ch>
Date: Tue, 10 Nov 2009 16:36:48 +0000
Subject: [PATCH] --- yaml --- r: 77565 b: "refs/heads/CMSSW_7_1_X" c:
 f27819e35a0b339e3c09f2785b06ad481abc8676 h: "refs/heads/CMSSW_7_1_X" i:  
 77563: d5b7660b02920ef520d80ef3b475704fd0b8249b v: v3

---
 [refs]                                         |  2 +-
 .../Examples/plugins/GsfElectronMCAnalyzer.cc  |  7 +++----
 trunk/RecoEgamma/Examples/test/OvalFile        | 18 +++++++++---------
 .../RecoEgamma/Examples/test/newvalidation.csh |  5 ++---
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 9b2de5fcff030..4f5ceeaf9c8e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": 4eff16cc357716d19d1ca0fa5b833282f77b1267
+"refs/heads/CMSSW_7_1_X": f27819e35a0b339e3c09f2785b06ad481abc8676
diff --git a/trunk/RecoEgamma/Examples/plugins/GsfElectronMCAnalyzer.cc b/trunk/RecoEgamma/Examples/plugins/GsfElectronMCAnalyzer.cc
index a220e7713e446..64cd8329e2575 100644
--- a/trunk/RecoEgamma/Examples/plugins/GsfElectronMCAnalyzer.cc
+++ b/trunk/RecoEgamma/Examples/plugins/GsfElectronMCAnalyzer.cc
@@ -13,7 +13,7 @@
 //
 // Original Author:  Ursula Berthon
 //         Created:  Mon Mar 27 13:22:06 CEST 2006
-// $Id: GsfElectronMCAnalyzer.cc,v 1.43 2009/10/10 09:09:18 chamont Exp $
+// $Id: GsfElectronMCAnalyzer.cc,v 1.44 2009/10/29 23:11:12 chamont Exp $
 //
 //
 
@@ -50,7 +50,7 @@
 using namespace reco;
 
 GsfElectronMCAnalyzer::GsfElectronMCAnalyzer(const edm::ParameterSet& conf)
-{
+ {
   outputFile_ = conf.getParameter<std::string>("outputFile");
   histfile_ = new TFile(outputFile_.c_str(),"RECREATE");
   electronCollection_=conf.getParameter<edm::InputTag>("electronCollection");
@@ -111,8 +111,7 @@ GsfElectronMCAnalyzer::GsfElectronMCAnalyzer(const edm::ParameterSet& conf)
   nbinhoe= pset.getParameter<int>("Nbinhoe");
   hoemin=pset.getParameter<double>("Hoemin");
   hoemax=pset.getParameter<double>("Hoemax");
-
-}
+ }
 
 void GsfElectronMCAnalyzer::beginJob(){
 
diff --git a/trunk/RecoEgamma/Examples/test/OvalFile b/trunk/RecoEgamma/Examples/test/OvalFile
index 4d3710733bb20..dcee060dd5cff 100644
--- a/trunk/RecoEgamma/Examples/test/OvalFile
+++ b/trunk/RecoEgamma/Examples/test/OvalFile
@@ -19,7 +19,7 @@ which compares the histograms from two releases. newvalidation.csh relies
 on the ROOT script newvalidation.C.
 
 <var name="VAL_NEW_RELEASE" value="340pre5">
-<var name="VAL_REF_RELEASE" value="340pre2">
+<var name="VAL_REF_RELEASE" value="340pre5">
 
 %IMPORTANT% If we do not set specific VAL_REF_File values below, newvalidation.csh will
 %IMPORTANT% compare the current histograms with the root files stored as ref in CVS. In such
@@ -151,36 +151,36 @@ with the local modified code.
 
     <environment name="RedoFromCorePt10">
       <var name="DBS_SAMPLE" value="RelValSingleElectronPt10">
-      <var name="TEST_OUTPUT_FILE" value="/tmp/${DBS_SAMPLE}-RECO.root">
+      <var name="TEST_OUTPUT_FILE" value="${TMPDIR}/${DBS_SAMPLE}-RECO.root">
       <executable name="dbs_discovery.py">
       <executable name="cmsRun" args="GsfElectronRedoFromCore_cfg.py">
     </environment>
   
     <environment name="RedoFromCorePt35">
       <var name="DBS_SAMPLE" value="RelValSingleElectronPt35">
-      <var name="TEST_OUTPUT_FILE" value="/tmp/${DBS_SAMPLE}-RECO.root">
+      <var name="TEST_OUTPUT_FILE" value="${TMPDIR}/${DBS_SAMPLE}-RECO.root">
       <executable name="dbs_discovery.py">
       <executable name="cmsRun" args="GsfElectronRedoFromCore_cfg.py">
     </environment>
   
     <environment name="RedoFromCoreTTbar">
       <var name="DBS_SAMPLE" value="RelValTTbar">
-      <var name="TEST_OUTPUT_FILE" value="/tmp/${DBS_SAMPLE}-RECO.root">
+      <var name="TEST_OUTPUT_FILE" value="${TMPDIR}/${DBS_SAMPLE}-RECO.root">
       <executable name="dbs_discovery.py">
       <executable name="cmsRun" args="GsfElectronRedoFromCore_cfg.py">
     </environment>
   
     <environment name="RedoFromCoreZEEIdeal">
       <var name="DBS_SAMPLE" value="RelValZEE">
-      <var name="TEST_OUTPUT_FILE" value="/tmp/${DBS_SAMPLE}-MC-RECO.root">
+      <var name="TEST_OUTPUT_FILE" value="${TMPDIR}/${DBS_SAMPLE}-MC-RECO.root">
       <executable name="dbs_discovery.py">
       <executable name="cmsRun" args="GsfElectronRedoFromCore_cfg.py">
     </environment>
   
     <environment name="RedoFromCoreZEEStartup">
       <var name="DBS_SAMPLE" value="RelValZEE">
-      <var name="TEST_OUTPUT_FILE" value="/tmp/${DBS_SAMPLE}-STARTUP-RECO.root">
-      <var name="TEST_GLOBAL_TAG" value="STARTUP3XY_V11">
+      <var name="TEST_OUTPUT_FILE" value="${TMPDIR}/${DBS_SAMPLE}-STARTUP-RECO.root">
+      <var name="TEST_GLOBAL_TAG" value="STARTUP3X_V11">
       <var name="DBS_COND" value="${TEST_GLOBAL_TAG}-v*">
       <executable name="dbs_discovery.py">
       <executable name="cmsRun" args="GsfElectronRedoFromCore_cfg.py">
@@ -188,7 +188,7 @@ with the local modified code.
   
     <environment name="RedoFromCoreQcdPt80-120">
       <var name="DBS_SAMPLE" value="RelValQCD_Pt_80_120">
-      <var name="TEST_OUTPUT_FILE" value="/tmp/${DBS_SAMPLE}-RECO.root">
+      <var name="TEST_OUTPUT_FILE" value="${TMPDIR}/${DBS_SAMPLE}-RECO.root">
       <executable name="dbs_discovery.py">
       <executable name="cmsRun" args="GsfElectronRedoFromCore_cfg.py">
     </environment>
@@ -230,7 +230,7 @@ with the local modified code.
     <environment name="RedoFromRawZEEStartup">
       <var name="DBS_SAMPLE" value="RelValZEE">
       <var name="TEST_OUTPUT_FILE" value="${TMPDIR}/${DBS_SAMPLE}-STARTUP-RECO.root">
-      <var name="TEST_GLOBAL_TAG" value="STARTUP3XY_V11">
+      <var name="TEST_GLOBAL_TAG" value="STARTUP3X_V11">
       <var name="DBS_COND" value="${TEST_GLOBAL_TAG}-v*">
       <executable name="dbs_discovery.py">
       <executable name="cmsRun" args="GsfElectronRedoFromRaw_cfg.py">
diff --git a/trunk/RecoEgamma/Examples/test/newvalidation.csh b/trunk/RecoEgamma/Examples/test/newvalidation.csh
index 33fdb01c9abea..3559920e4f5b2 100755
--- a/trunk/RecoEgamma/Examples/test/newvalidation.csh
+++ b/trunk/RecoEgamma/Examples/test/newvalidation.csh
@@ -152,10 +152,9 @@ echo "VAL_REF_FILE = ${VAL_REF_FILE}"
 
 if ( "${VAL_REF_FILE}" != "" && "${REF_ALREADY_STORED}" == "" ) then
 
-  if ( ! -d $VAL_WEB/$VAL_NEW_RELEASE/vs${VAL_REF_RELEASE}/data ) then
-    mkdir $VAL_WEB/$VAL_NEW_RELEASE/vs${VAL_REF_RELEASE}/data
+  if ( ! -d $VAL_WEB/$VAL_NEW_RELEASE/Electrons/vs${VAL_REF_RELEASE}/data ) then
+    mkdir $VAL_WEB/$VAL_NEW_RELEASE/Electrons/vs${VAL_REF_RELEASE}/data
   endif
-
   cp -f $VAL_REF_FILE $VAL_WEB/$VAL_NEW_RELEASE/Electrons/vs${VAL_REF_RELEASE}/data
   setenv VAL_REF_FILE "$VAL_WEB/$VAL_NEW_RELEASE/Electrons/vs${VAL_REF_RELEASE}/data/${VAL_REF_FILE:t}"
   echo "VAL_REF_FILE = ${VAL_REF_FILE}"