diff.txt

Index: Root/MuonHelper.cxx
===================================================================
--- Root/MuonHelper.cxx	(revision 239543)
+++ Root/MuonHelper.cxx	(revision 239606)
@@ -34,51 +34,51 @@
 //
 
 // Retreive the muon container and apply calibrations
-void MuonHelper::RetrieveMuons()
+void MuonHelper::RetrieveMuons(xAOD::MuonContainer*& muons,xAOD::ShallowAuxContainer*& muons_aux, bool isNominal)
 {
-  xAOD::MuonContainer*       muons(0);
-  xAOD::ShallowAuxContainer* muons_aux(0);
-
   //Take advantage of TStore memory management
-  m_susy_tools->GetMuons(muons,muons_aux,true);
-  m_muons_copy = muons;
-  m_muons_copy_aux = muons_aux;
+  m_susy_tools->GetMuons(muons,muons_aux);//,true);
  
   // get cosmic and bad muons decorations
-  for(const auto muon : *m_muons_copy) { 
+  for(const auto muon : *muons) { 
     m_susy_tools->IsCosmicMuon( *muon);
     m_susy_tools->IsBadMuon( *muon);
   }
+  
+  // Store only the nominal calibration=  
+  if(isNominal) {
+    m_muons_copy = muons;
+    m_muons_copy_aux = muons_aux;
+  }
 }
 
 //_________________________________________________________________________
 //
 
 // Apply kinematic and quality cuts
-void MuonHelper::RetrieveSignalMuons()
+void MuonHelper::RetrieveSignalMuons(xAOD::MuonContainer*& muons,xAOD::ShallowAuxContainer*& muons_aux, bool isNominal)
 {
   
   ConstDataVector<xAOD::MuonContainer> * selected_muons =  new ConstDataVector<xAOD::MuonContainer>(SG::VIEW_ELEMENTS);
 
   static SG::AuxElement::ConstAccessor< char > baseline("baseline");
-
- static SG::AuxElement::ConstAccessor< char > passOR("passOR");
   
-  for(const auto &muon : *m_muons_copy) {
-   
+  static SG::AuxElement::ConstAccessor< char > passOR("passOR");
+  
+  for(const auto &muon : *muons) {
+    
     if(!m_susy_tools->IsSignalMuon(*muon, 20000.)) continue;
-    
     if(!passOR.isAvailable(*muon) || passOR(*muon) == 0) continue;    
     
-    selected_muons->push_back(muon);
+    if(isNominal) selected_muons->push_back(muon);
   } 
-  m_store->record( selected_muons, "SelectedMuons" );
-  
-  // sort in pT
 
-  std::sort ( selected_muons->begin(), selected_muons->end(), HelperFunctions::pt_sort() );
-
-  m_signal_muons = selected_muons->asDataVector();
+  if(isNominal) {
+    m_store->record( selected_muons, "SelectedMuons" );
+    // sort in pT
+    std::sort ( selected_muons->begin(), selected_muons->end(), HelperFunctions::pt_sort() );
+    m_signal_muons = selected_muons->asDataVector();
+  }
 }
 
 //_________________________________________________________________________
Index: Root/TreeMaker.cxx
===================================================================
--- Root/TreeMaker.cxx	(revision 239543)
+++ Root/TreeMaker.cxx	(revision 239606)
@@ -178,7 +178,6 @@
 			 std::vector< bool > v_trigger,
 			 double weight[3])
 {
- 
   Reset();
   
   m_event_number = event_number;
@@ -195,8 +194,8 @@
   m_metcst_phi = v_metcst->phi();
   m_mettst     = v_mettst->met() / MEV;
   m_mettst_phi = v_mettst->phi();
- 
 
+
   // default met is mtcst
   m_meff = Variables::Meff_incl(v_metcst, v_jets, v_muons, v_electrons);
   m_ht = Variables::Ht(v_jets, v_muons, v_electrons); 
@@ -213,6 +212,8 @@
 
   m_muons_n = v_muons->size();
   for (auto muon : *v_muons) {
+    if(muon->auxdata<char>("baseline")==0) continue;
+    
     m_muons_pt.push_back(muon->pt() / MEV);
     m_muons_eta.push_back(muon->eta());
     m_muons_phi.push_back(muon->phi()); 
@@ -230,9 +231,11 @@
     m_muons_d0sig.push_back(HelperFunctions::getD0sig(muon));
     m_muons_z0.push_back(HelperFunctions::getZ0(muon, primary_vertex_z)); 
   }
- 
+
   m_electrons_n = v_electrons->size();
   for (auto electron : *v_electrons) {
+    if(electron->auxdata<char>("baseline")==0) continue;
+  
     m_electrons_pt.push_back(electron->pt() / MEV);
     m_electrons_eta.push_back(electron->eta());
     m_electrons_phi.push_back(electron->phi()); 
@@ -257,9 +260,11 @@
     m_electrons_z0.push_back(HelperFunctions::getZ0(electron, primary_vertex_z)); 
 
   }
- 
+
   m_jets_n = v_jets->size();
   for (auto jet : *v_jets) { 
+    if(jet->auxdata<char>("baseline")==0) continue;
+
     m_jets_pt.push_back(jet->pt() / MEV);
     m_jets_eta.push_back(jet->eta());
     m_jets_phi.push_back(jet->phi()); 
@@ -286,11 +291,10 @@
     m_jets_isb_85.push_back(btag_weight>-0.7682);
 
   }
-  
+
   for( auto trigger : v_trigger) {
     m_trigger.push_back(trigger);
   } 
-  
 }
 
 //_________________________________________________________________________
Index: Root/JetHelper.cxx
===================================================================
--- Root/JetHelper.cxx	(revision 239543)
+++ Root/JetHelper.cxx	(revision 239606)
@@ -92,20 +92,23 @@
 //
 
 // Retreive the jet container and apply calibrations
-void JetHelper::RetrieveJets()
+void JetHelper::RetrieveJets(xAOD::JetContainer*& jets,xAOD::ShallowAuxContainer*& jets_aux, bool isNominal)
 {
-  xAOD::JetContainer*        jets(0);
-  xAOD::ShallowAuxContainer* jets_aux(0);
-  m_susy_tools->GetJets(jets,jets_aux,true,"AntiKt4EMTopoJets");
-  m_jets_copy = jets;
-  m_jets_copy_aux = jets_aux;
+ 
+  m_susy_tools->GetJets(jets,jets_aux,false,"AntiKt4EMTopoJets");
+  
+  // Store only the nominal calibration
+  if(isNominal) {
+    m_jets_copy = jets;
+    m_jets_copy_aux = jets_aux;
+  }
 }
 
 //_________________________________________________________________________
 //
 
 // Apply kinematic and quality cuts
-void JetHelper::RetrieveSignalJets()
+void JetHelper::RetrieveSignalJets(xAOD::JetContainer*& jets,xAOD::ShallowAuxContainer*& jets_aux, bool isNominal)
 {
 
 
@@ -115,11 +118,11 @@
   static SG::AuxElement::ConstAccessor< char > bad("bad");
   m_nb_bad_jets = 0; 
 
-  for(const auto &jet : *m_jets_copy) {
-  
+  for(const auto &jet : *jets) {
+    
     // OR and JVT applied in IsSignalJet
+    m_susy_tools->IsBadJet(*jet);
     if(!m_susy_tools->IsSignalJet(*jet, 20000., 2.8)) continue;
-    
     if(!bad.isAvailable(*jet) || bad(*jet) == 1) m_nb_bad_jets++;   
     
     double btag_weight = -99.;
@@ -127,24 +130,26 @@
     
     jet->setAttribute("btag_MV2c20", btag_weight);
     
-    selected_jets->push_back(jet);
+    if(isNominal) {
+      selected_jets->push_back(jet);
     
     // kinematic cuts applied to b-jets as needed the b-tagging SFs
-    if(fabs(jet->eta())<2.5) 
-      selected_b_jets->push_back(jet);
+      if(fabs(jet->eta())<2.5) 
+	selected_b_jets->push_back(jet);
+    }
   }
-  
-  m_store->record(selected_jets,   "SelectedJets");
-  m_store->record(selected_b_jets, "SelectedBJets");
-
-  // sort in pT
-  // std::sort ( m_jets_vector.begin(), m_jets_vector.end(), pt_sort);
-  std::sort (selected_jets->begin(), selected_jets->end(), HelperFunctions::pt_sort());
-  std::sort (selected_b_jets->begin(), selected_b_jets->end(), HelperFunctions::pt_sort());
-
-  m_signal_jets   = selected_jets->asDataVector();
-  m_jets_btagging = selected_b_jets->asDataVector();
-
+  if(isNominal) {
+    m_store->record(selected_jets,   "SelectedJets");
+    m_store->record(selected_b_jets, "SelectedBJets");
+    
+    // sort in pT
+    // std::sort ( m_jets_vector.begin(), m_jets_vector.end(), pt_sort);
+    std::sort (selected_jets->begin(), selected_jets->end(), HelperFunctions::pt_sort());
+    std::sort (selected_b_jets->begin(), selected_b_jets->end(), HelperFunctions::pt_sort());
+    
+    m_signal_jets   = selected_jets->asDataVector();
+    m_jets_btagging = selected_b_jets->asDataVector();
+  }
 }
 
 
Index: Root/HistFitterInputMaker.cxx
===================================================================
--- Root/HistFitterInputMaker.cxx	(revision 0)
+++ Root/HistFitterInputMaker.cxx	(revision 239606)
@@ -0,0 +1,110 @@
+#include "MultibjetsAnalysis/HistFitterInputMaker.h"
+#include "MultibjetsAnalysis/Variables.h"
+#include "MultibjetsAnalysis/TruthParticleHelper.h"
+#include "MultibjetsAnalysis/HelperFunctions.h"
+
+#include <utility>
+// xAOD
+#include "xAODEgamma/Electron.h"
+#include "xAODEgamma/ElectronContainer.h"
+#include "xAODEgamma/ElectronAuxContainer.h"
+
+#include "EventPrimitives/EventPrimitivesHelpers.h"
+#include "xAODPrimitives/IsolationType.h"
+#include "xAODEgamma/EgammaxAODHelpers.h"
+
+#include<memory>
+
+//_________________________________________________________________________
+//
+HistFitterInputMaker::HistFitterInputMaker(TFile *file, std::vector<ST::SystInfo> sys_list) 
+{
+
+  TTree* tree_nom = new TTree("nominal", "nominal");
+  m_tree_map.insert( std::pair< string, TTree*> ("nominal" , tree_nom) ); 
+  m_tree_map["nominal"]->SetDirectory (file);  
+
+  for(const auto& sys : sys_list) {
+    if(sys.affectsKinematics){
+      const CP::SystematicSet& sysSet = sys.systset;
+      const char* sys_name = sysSet.name().c_str();
+      TTree* tree_sys = new TTree(sys_name, sys_name);
+      m_tree_map.insert( std::pair< string, TTree*> (sys_name , tree_sys) ); 
+      m_tree_map[sys_name]->SetDirectory (file);   
+    }
+  }
+
+
+  for(auto &it : m_tree_map) {
+
+  it.second->Branch("muons_n",&m_muons_n, "muons_n/I"); 
+  it.second->Branch("electrons_n",&m_elecs_n, "electrons_n/I"); 
+  it.second->Branch("jets_n",&m_jets_n, "jets_n/I"); 
+
+  it.second->Branch("met",&m_met,"met/F");
+  it.second->Branch("meff",&m_meff,"meff/F");
+  }
+}
+
+
+
+//_________________________________________________________________________
+//
+HistFitterInputMaker::~HistFitterInputMaker(){
+ 
+}
+
+//_________________________________________________________________________
+//
+void HistFitterInputMaker::Fill(std::string sys_name,
+				const xAOD::MuonContainer* v_muons,
+				const xAOD::ElectronContainer* v_electrons,
+				const xAOD::JetContainer* v_jets,
+				const xAOD::MissingET* v_met,
+				double weight[3])
+{
+ 
+  Reset();
+
+  for (auto muon : *v_muons) { 
+    if(muon->auxdata<char>("baseline")==0) continue;
+    m_muons_n ++;
+  }
+  
+  for (auto electron : *v_electrons) { 
+    if(electron->auxdata<char>("baseline")==0) continue;
+    m_elecs_n ++;
+  }
+  
+  for (auto jet : *v_jets) { 
+    if(jet->auxdata<char>("baseline")==0) continue;
+    m_jets_n ++;
+  }
+
+  m_met = v_met->met() / MEV;
+  m_meff = Variables::Meff_incl(v_met, v_jets, v_muons, v_electrons); 
+  
+  m_tree_map[sys_name]->Fill();
+}
+
+//_________________________________________________________________________
+//
+void HistFitterInputMaker::Write()
+{
+  for(auto &it : m_tree_map) {
+    
+    it.second->Write();
+  }
+}
+
+//_________________________________________________________________________
+//
+void HistFitterInputMaker::Reset()
+{
+  m_muons_n = 0;
+  m_elecs_n = 0;
+  m_jets_n = 0;
+  
+  m_met  = 0;
+  m_meff = 0;
+}

Property changes on: Root/HistFitterInputMaker.cxx
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author HeadURL Id

Index: Root/BaselineSelection.cxx
===================================================================
--- Root/BaselineSelection.cxx	(revision 239543)
+++ Root/BaselineSelection.cxx	(revision 239606)
@@ -7,7 +7,6 @@
 
   bool result = false;
 
-
   if( met->met() / MEV > 50. && v_jets->size()>1) result = true;
   if( v_muons->size() > 0) result = true;
   if( v_electrons->size() > 0) result = true;
Index: Root/MainAnalysis.cxx
===================================================================
--- Root/MainAnalysis.cxx	(revision 239543)
+++ Root/MainAnalysis.cxx	(revision 239606)
@@ -23,7 +23,6 @@
 
 // CP and PAT tools
 #include "GoodRunsLists/GoodRunsListSelectionTool.h"
-#include "PileupReweighting/PileupReweightingTool.h"
 #include "CPAnalysisExamples/errorcheck.h"
 #include "SUSYTools/SUSYObjDef_xAOD.h"
 #include "SUSYTools/SUSYCrossSection.h"
@@ -41,6 +40,7 @@
 
 // output tree
 #include "MultibjetsAnalysis/TreeMaker.h"
+#include "MultibjetsAnalysis/HistFitterInputMaker.h"
 
 // selection
 #include "MultibjetsAnalysis/BaselineSelection.h"
@@ -80,11 +80,11 @@
     m_nb_events_weight(0),
     m_nb_events_weight_squared(0),
     m_grl(0), 
-    m_pileup(0),
     m_susy_tools(0),   
     m_trig_decision_tool(0),
     m_config_tool(0),
     m_tree_maker(0),
+    m_histfitter_input_maker(0),
     m_or_tool(0),
     m_metadata_tool(0),
     m_trigger_metadata_tool(0),
@@ -106,7 +106,6 @@
 MainAnalysis :: ~MainAnalysis ()
 {
   delete m_grl;
-  delete m_pileup;
   delete m_susy_tools;
   delete m_trig_decision_tool;
   delete m_config_tool;
@@ -143,6 +142,9 @@
   EL::OutputStream out_tree ("output_tree");
   job.outputAdd (out_tree);
 
+  EL::OutputStream out_histfitter ("output_histfitter");
+  job.outputAdd (out_histfitter);
+
   return EL::StatusCode::SUCCESS;
 }
 
@@ -293,17 +295,29 @@
   }
 
   CHECK( m_susy_tools->setProperty("DataSource", data_source) );
-  //CHECK( m_susy_tools->setProperty("EleIsoWP","Gradient") );
-  
+  CHECK( m_susy_tools->setProperty("EleIsoWP","GradientLoose") );
+  CHECK( m_susy_tools->setProperty("PhotonIsoWP","Cone20") );
+
   // use SUSYTools default as much as possible
-  //CHECK( m_susy_tools->setProperty("DoJetAreaCalib",m_doJetArea) );
-  //CHECK( m_susy_tools->setProperty("DoJetGSCCalib",m_doJetGSC) );
-  //CHECK( m_susy_tools->setProperty("EleId",m_EleIdSignal) );
-  //CHECK( m_susy_tools->setProperty("EleIdBaseline",m_EleIdBaseline) );
+  CHECK( m_susy_tools->setProperty("JetInputType", xAOD::JetInput::EMTopo) );  
+  CHECK( m_susy_tools->setProperty("DoJetAreaCalib",m_doJetArea) );
+  CHECK( m_susy_tools->setProperty("DoJetGSCCalib",m_doJetGSC) );
+  CHECK( m_susy_tools->setProperty("EleId",m_EleIdSignal) );
+  CHECK( m_susy_tools->setProperty("EleIdBaseline",m_EleIdBaseline) );
 
   // This should probably be re-enabled at some point
-  //CHECK( m_susy_tools->setProperty("JESNuisanceParameterSet",m_JESNuisanceParameterSet) );
+  CHECK( m_susy_tools->setProperty("JESNuisanceParameterSet",m_JESNuisanceParameterSet) );
+  CHECK( m_susy_tools->setProperty("METDoTrkSyst",true) );
+  CHECK( m_susy_tools->setProperty("METDoCaloSyst",false) );
 
+  // pileup
+  std::vector<std::string> prw_conf;
+  prw_conf.push_back(m_maindir+"MultibjetsAnalysis/prw_week1.test.root");
+  CHECK( m_susy_tools->setProperty("PRWConfigFiles", prw_conf) );
+  std::vector<std::string> prw_lumicalc;
+  prw_lumicalc.push_back(m_maindir+"MultibjetsAnalysis/ilumicalc_histograms_None_266904-267639.root");
+  CHECK( m_susy_tools->setProperty("PRWLumiCalcFiles", prw_lumicalc) );
+
   if(m_debug) {
     m_susy_tools->msg().setLevel( MSG::VERBOSE );
     CHECK(m_susy_tools->setProperty("DebugMode", true) );
@@ -329,19 +343,6 @@
     return EL::StatusCode::FAILURE;
   }
 
-  // initialize Pile Up Reweighting
-  m_pileup= new PileupReweightingTool("PileupReweightingTool");
-  std::vector<std::string> prwFiles;
-  prwFiles.push_back("PileupReweighting/mc14v1_defaults.prw.root");
-  CHECK( m_pileup->setProperty("ConfigFiles",prwFiles) );
-  std::vector<std::string> lumicalcFiles;
-  lumicalcFiles.push_back(m_maindir+"SUSYTools/susy_data12_avgintperbx.root");
-  CHECK( m_pileup->setProperty("LumiCalcFiles",lumicalcFiles) );
-  if(!m_pileup->initialize().isSuccess()){
-    Error(APP_NAME, "Failed to properly initialize the Pile Up Reweighting. Exiting." );
-    return EL::StatusCode::FAILURE;
-  }
-
   //---------------------------
   // Large-R Jet Calibrations
   //---------------------------
@@ -396,10 +397,18 @@
     m_syst_info_list = m_susy_tools->getSystInfoList();
   }
 
+  if(m_debug) std::cout << " call resetSystematics()" << std::endl;
+  if (m_susy_tools->resetSystematics() != CP::SystematicCode::Ok) {
+    Error(APP_NAME, "Cannot reset SUSYTools systematics" );
+  }
+
   // output files
   TFile *file_tree = wk()->getOutputFile ("output_tree");
   m_tree_maker = new TreeMaker(file_tree, m_doTruth, m_doRcJets, m_doAK10Jets);
 
+  TFile *file_histfitter = wk()->getOutputFile ("output_histfitter");
+  m_histfitter_input_maker = new HistFitterInputMaker(file_histfitter, m_syst_info_list);
+
   TFile *file_xAOD = wk()->getOutputFile ("output_xAOD");
   event->writeTo(file_xAOD);
 
@@ -514,7 +523,7 @@
   else  trigger_file.open(m_maindir+"MultibjetsAnalysis/trigger_menu_data.txt");
   string item = "";
   while (trigger_file >> item) {
-    v_trigger.push_back( m_susy_tools->isTrigPassed(item) );
+    v_trigger.push_back( m_susy_tools->IsTrigPassed(item) );
     }
   // to add in SUSYTools to get the trigger file
   /*  
@@ -553,7 +562,7 @@
     m_weight[mc] = (eventInfo->mcEventWeights()).at(0);
     if(m_doPileup){
       // do pileup reweighting
-       m_weight[pileup] = m_pileup->getCombinedWeight( *eventInfo ); 
+       m_weight[pileup] = m_susy_tools->GetPileupWeight(); 
     }
     // get cross-section
     if(m_cross_section==0) {
@@ -593,19 +602,19 @@
   
   if(m_debug)  std::cout << "Retrieve nominal electrons" << endl;
   xAOD::ElectronContainer* electrons_nominal(0);
-  electron_helper.RetrieveElectrons();
-  electrons_nominal = electron_helper.GetShallowCopy();
+  xAOD::ShallowAuxContainer* electrons_nominal_aux(0);
+  electron_helper.RetrieveElectrons(electrons_nominal,electrons_nominal_aux, true);
 
   if(m_debug)  std::cout << "Retrieve nominal muons" << endl;
   xAOD::MuonContainer* muons_nominal(0);
-  muon_helper.RetrieveMuons();
-  muons_nominal = muon_helper.GetShallowCopy();
-
+  xAOD::ShallowAuxContainer* muons_nominal_aux(0);
+  muon_helper.RetrieveMuons(muons_nominal, muons_nominal_aux, true);
+  
   if(m_debug)  std::cout << "Retrieve nominal jets" << endl;
   xAOD::JetContainer* jets_nominal(0);
-  jet_helper.RetrieveJets();
-  jets_nominal = jet_helper.GetShallowCopy();
-
+  xAOD::ShallowAuxContainer* jets_nominal_aux(0);
+  jet_helper.RetrieveJets(jets_nominal, jets_nominal_aux, true);
+  
   const xAOD::JetContainer* ak10_jets(0);
 
   // overlap removal
@@ -616,31 +625,24 @@
 
   // MET  (keep both cst and tst)
   // There might be a cleaner way to handle this, but good enough for now.
-  xAOD::MissingETContainer* metcst_nominal        = new xAOD::MissingETContainer;
-  xAOD::MissingETAuxContainer* metcst_nominal_aux = new xAOD::MissingETAuxContainer;
-  metcst_nominal->setStore(metcst_nominal_aux);
-  xAOD::MissingETContainer* mettst_nominal        = new xAOD::MissingETContainer;
-  xAOD::MissingETAuxContainer* mettst_nominal_aux = new xAOD::MissingETAuxContainer;
-  mettst_nominal->setStore(mettst_nominal_aux);
-  
+  xAOD::MissingETContainer* c_metcst_nominal        = new xAOD::MissingETContainer;
+  xAOD::MissingETAuxContainer* c_metcst_nominal_aux = new xAOD::MissingETAuxContainer;
+  c_metcst_nominal->setStore(c_metcst_nominal_aux);
+  c_metcst_nominal->reserve(10);
+  xAOD::MissingETContainer* c_mettst_nominal        = new xAOD::MissingETContainer;
+  xAOD::MissingETAuxContainer* c_mettst_nominal_aux = new xAOD::MissingETAuxContainer;
+  c_mettst_nominal->setStore(c_mettst_nominal_aux);
+  c_mettst_nominal->reserve(10);
+
   // Give memory ownership to TEvent
-  event->record( metcst_nominal, "Metcst" );
-  event->record( metcst_nominal_aux, "MetcstAux." );
-  event->record( mettst_nominal, "Mettst" );
-  event->record( mettst_nominal_aux, "MettstAux." );  
+  event->record( c_metcst_nominal, "Metcst" );
+  event->record( c_metcst_nominal_aux, "MetcstAux." );
+  event->record( c_mettst_nominal, "Mettst" );
+  event->record( c_mettst_nominal_aux, "MettstAux." );  
   
-  if(m_debug) std::cout << "Do nominal MET calculation" << endl;
-  CHECK( m_susy_tools->GetMET(*metcst_nominal, jets_nominal, electrons_nominal, muons_nominal, 0, 0, false) );
-  xAOD::MissingETContainer::const_iterator metcst_nominal_it = metcst_nominal->find("Final");
-  if (metcst_nominal_it == metcst_nominal->end()) Error( APP_NAME, "No RefFinal inside MET container" );
+  xAOD::MissingET* metcst_nominal(0);
+  xAOD::MissingET* mettst_nominal(0);
 
-  CHECK( m_susy_tools->GetMET(*mettst_nominal, jets_nominal, electrons_nominal, muons_nominal, 0, 0, true) );
-  xAOD::MissingETContainer::const_iterator mettst_nominal_it = mettst_nominal->find("Final");
-  if (mettst_nominal_it == mettst_nominal->end()) Error( APP_NAME, "No RefFinal inside MET container" );
-  
-  const xAOD::MissingET* metcst(*metcst_nominal_it);
-  const xAOD::MissingET* mettst(*mettst_nominal_it);
-
   // This is still around temporarily, but is on the way out.
   FatJetVector v_rc_jets; v_rc_jets.clear();
 
@@ -684,6 +686,7 @@
   //---------------------------
   // Loop over all systematics
   //---------------------------
+ 
   if(m_debug) std::cout << "loop over systematics" << std::endl;
   bool is_nominal(true);
   bool pass_selection(false);
@@ -692,84 +695,124 @@
     const CP::SystematicSet& sys = sys_info.systset;
     if(m_debug)  std::cout << ">>>> Working on variation: \"" <<(sys.name()).c_str() << "\" <<<<<<" << std::endl;
 
+    //if (sys.name().find("EG_RESOLUTION") != std::string::npos) continue;
+    //if (sys.name().find("EG_SCALE") != std::string::npos) continue;
+   
     // Tell the SUSYObjDef_xAOD which variation to apply
-    if (m_susy_tools->applySystematicVariation(sys) != CP::SystematicCode::Ok){
+    if(m_debug)  std::cout << "Call applySystematicVariation(sys)" << endl;
+     if (m_susy_tools->applySystematicVariation(sys) != CP::SystematicCode::Ok){
       cout << "Cannot configure SUSYTools for systematic variation " << (sys.name()).c_str() << endl;
     }
 
     if(sys_info.affectsKinematics || sys_info.affectsWeights) is_nominal = false;
-
+    
     // If kinematics affected, make a shallow copy with the variation applied
     bool syst_affects_electrons = ST::testAffectsObject(xAOD::Type::Electron, sys_info.affectsType);
     bool syst_affects_muons     = ST::testAffectsObject(xAOD::Type::Muon, sys_info.affectsType);
     bool syst_affects_jets      = ST::testAffectsObject(xAOD::Type::Jet, sys_info.affectsType);
     bool syst_affects_bTag      = ST::testAffectsObject(xAOD::Type::BTag, sys_info.affectsType);
     //bool syst_affects_met = ST::testAffectsObject(xAOD::Type::MissingET, sys_info.affectsType);
+
+    xAOD::ElectronContainer* electrons(electrons_nominal);
+    xAOD::MuonContainer* muons(muons_nominal);
+    xAOD::JetContainer* jets(jets_nominal);
     
-    // Generic pointers for either nominal or systematics copy
-    xAOD::ElectronContainer* electrons_syst(electrons_nominal);
-    xAOD::MuonContainer* muons_syst(muons_nominal);
-    xAOD::JetContainer* jets_syst(jets_nominal);
-    
+    xAOD::ShallowAuxContainer* electrons_aux(electrons_nominal_aux);
+    xAOD::ShallowAuxContainer* muons_aux(muons_nominal_aux);
+    xAOD::ShallowAuxContainer* jets_aux(jets_nominal_aux);
+  
     if(sys_info.affectsKinematics) {
       // retrieve physics objects after calibration recomputed for each systematic
       if(syst_affects_electrons) {
 	if(m_debug)  std::cout << "Retrieve electrons for systematics" << endl;
-        electron_helper.RetrieveElectrons();
-        electrons_syst = electron_helper.GetShallowCopy();
+	xAOD::ElectronContainer* electrons_syst(0);
+	xAOD::ShallowAuxContainer* electrons_syst_aux(0);
+        electron_helper.RetrieveElectrons(electrons_syst, electrons_syst_aux, is_nominal);
+	electrons = electrons_syst;
+	electrons_aux = electrons_syst_aux;
       }
       if(syst_affects_muons) {
 	if(m_debug)  std::cout << "Retrieve muons for systematics" << endl;
-        muon_helper.RetrieveMuons();
-        muons_syst = muon_helper.GetShallowCopy();
+	xAOD::MuonContainer* muons_syst(0);
+	xAOD::ShallowAuxContainer* muons_syst_aux(0);
+        muon_helper.RetrieveMuons(muons_syst, muons_syst_aux, is_nominal);
+       	muons = muons_syst;
+	muons_aux = muons_syst_aux;
       }
       if(syst_affects_jets) {
 	if(m_debug)  std::cout << "Retrieve jets for systematics" << endl;
-        jet_helper.RetrieveJets();
-        jets_syst = jet_helper.GetShallowCopy();
+	xAOD::JetContainer* jets_syst(0);
+	xAOD::ShallowAuxContainer* jets_syst_aux(0);
+        jet_helper.RetrieveJets(jets_syst, jets_syst_aux, is_nominal);
+       	jets = jets_syst;
+	jets_aux = jets_syst_aux;
       }
     }
     
     //overlap removal
     if(sys_info.affectsKinematics && (syst_affects_electrons || syst_affects_muons || syst_affects_jets) ) {
       if(m_debug)  std::cout << "Do overlap removal" << endl;
-      CHECK(  m_susy_tools->OverlapRemoval(electrons_syst, muons_syst, jets_syst) );
+      CHECK(  m_susy_tools->OverlapRemoval(electrons, muons, jets) );
     }
     
-    // met calculation calculation
-    xAOD::MissingETContainer* c_metcst_syst(metcst_nominal);
-    xAOD::MissingETContainer* c_mettst_syst(mettst_nominal);
-    xAOD::MissingET* metcst_syst(*metcst_nominal_it);
-    xAOD::MissingET* mettst_syst(*mettst_nominal_it);
+    // met calculation calculation   
+    if(is_nominal) {
+      if(m_debug)  std::cout << "Do nominal MET calculation" << endl;
+      
+      CHECK( m_susy_tools->GetMET(*c_metcst_nominal, jets, electrons, muons, 0, 0, false) );
+      xAOD::MissingETContainer::const_iterator metcst_it = c_metcst_nominal->find("Final");
+      if (metcst_it == c_metcst_nominal->end()) Error( APP_NAME, "No RefFinal inside MET container" );
+      metcst_nominal = (*metcst_it);
+      
+      CHECK( m_susy_tools->GetMET(*c_mettst_nominal, jets, electrons, muons, 0, 0, true) );
+      xAOD::MissingETContainer::const_iterator mettst_it = c_mettst_nominal->find("Final");
+      if (mettst_it == c_mettst_nominal->end()) Error( APP_NAME, "No RefFinal inside MET container" );
+      mettst_nominal = (*mettst_it);
+    }
 
+				
+    xAOD::MissingETContainer* metcst_syst = new xAOD::MissingETContainer;
+    xAOD::MissingETAuxContainer* metcst_syst_aux = new xAOD::MissingETAuxContainer;
+    xAOD::MissingETContainer* mettst_syst = new xAOD::MissingETContainer;
+    xAOD::MissingETAuxContainer* mettst_syst_aux = new xAOD::MissingETAuxContainer;
+    metcst_syst->setStore(metcst_syst_aux);
+    mettst_syst->setStore(mettst_syst_aux);
+    metcst_syst->reserve(10);
+    metcst_syst->reserve(10);
+     
+    xAOD::MissingET* metcst(0);
+    xAOD::MissingET* mettst(0);
+
     if(sys_info.affectsKinematics) {
-      if(m_debug)  std::cout << "Do MET calculation" << endl;
+      if(m_debug)  std::cout << "Do syst MET calculation" << endl;
+      CHECK( m_susy_tools->GetMET(*metcst_syst, jets, electrons, muons, 0, 0, false) );
+      xAOD::MissingETContainer::const_iterator metcst_it = metcst_syst->find("Final");
+      if (metcst_it == metcst_syst->end()) Error( APP_NAME, "No RefFinal inside MET container" );
+      metcst = (*metcst_it);
       
-      CHECK( m_susy_tools->GetMET(*c_metcst_syst, jets_syst, electrons_syst, muons_syst, 0, 0, false) );
-      xAOD::MissingETContainer::const_iterator metcst_syst_it = c_metcst_syst->find("Final");
-      if (metcst_syst_it == c_metcst_syst->end()) Error( APP_NAME, "No RefFinal inside MET container" );
-      metcst_syst = (*metcst_syst_it);
-      
-      CHECK( m_susy_tools->GetMET(*c_mettst_syst, jets_syst, electrons_syst, muons_syst, 0, 0, true) );
-      xAOD::MissingETContainer::const_iterator mettst_syst_it = c_mettst_syst->find("Final");
-      if (mettst_syst_it == c_mettst_syst->end()) Error( APP_NAME, "No RefFinal inside MET container" );
-      mettst_syst = (*mettst_syst_it);
+      CHECK( m_susy_tools->GetMET(*mettst_syst, jets, electrons, muons, 0, 0, true) );
+      xAOD::MissingETContainer::const_iterator mettst_it = mettst_syst->find("Final");
+      if (mettst_it == mettst_syst->end()) Error( APP_NAME, "No RefFinal inside MET container" );
+      mettst = (*mettst_it); 
     }
-    
+    else {
+      metcst = new xAOD::MissingET(*metcst_nominal);
+      mettst = new xAOD::MissingET(*mettst_nominal);
+    }
     if(m_debug) std::cout << "Retrieving signal objects" << std::endl;
     
     // retrieve signal objects
     if(is_nominal || (sys_info.affectsKinematics && syst_affects_electrons)) {
-      electron_helper.RetrieveSignalElectrons();
+      electron_helper.RetrieveSignalElectrons(electrons, electrons_aux, is_nominal);
     }
     if(is_nominal || (sys_info.affectsKinematics && syst_affects_muons)) {
-      muon_helper.RetrieveSignalMuons();
+      muon_helper.RetrieveSignalMuons(muons, muons_aux, is_nominal);
     }
     if(m_debug) std::cout << "Done with retrieving signal objects " << std::endl;
     
     if(is_nominal ||  (sys_info.affectsKinematics && syst_affects_jets)) {
       if(m_debug) std::cout << "Grabjets!" << std::endl;
-      jet_helper.RetrieveSignalJets();
+      jet_helper.RetrieveSignalJets(jets, jets_aux, is_nominal);
        
       if(m_debug) std::cout << "grab complicated jets " << std::endl;
       
@@ -807,36 +850,74 @@
     
     //Get electron scale factors
     if(is_nominal) { // || syst_affects_electrons) {
-      m_weight[elecSF] = m_susy_tools->GetTotalElectronSF(*electrons_syst);
+      m_weight[elecSF] = m_susy_tools->GetTotalElectronSF(*electrons);
     }
     
     //Get muon scale factors
     if(is_nominal) {// || syst_affects_muons) {
-      m_weight[muonSF] = m_susy_tools->GetTotalMuonSF(*muons_syst);
+      m_weight[muonSF] = m_susy_tools->GetTotalMuonSF(*muons);
     }
     
     // EventSelection
-    m_cut_flow[3]++;
+    if(is_nominal)  m_cut_flow[3]++;
     // veto events with bad jets
     //if(jet_helper.GetNbBadJets()>0) continue;
     
-    m_cut_flow[4]++;
+    if(is_nominal) m_cut_flow[4]++;
     
-    if(m_debug) std::cout << "test for baseline selection" << std::endl;
+    // Fill HistFitter input tree for all events
+    if(is_nominal || sys_info.affectsKinematics) {
+      std::string name_syst = "";
+      if(is_nominal) name_syst = "nominal";
+      else name_syst = (sys.name()).c_str();
+      m_histfitter_input_maker->Fill(name_syst,
+				     muons,
+				     electrons,
+				     jets,
+				     mettst,
+				     m_weight);
+      if(m_debug) std::cout << "after histfitter input tree " << std::endl;
+      
+      
+      if(m_debug) std::cout << "test for baseline selection" << std::endl;
+      // keep event if satisfies the selection cuts for at least one systematic variation
+      if(BaselineSelection::keep(mettst, jets, muons, electrons) || !isMC)
+	{
+	  if(m_debug) std::cout << " passed baseline " << std::endl;
+	  pass_selection = true;
+	  //break;
+	}
+    } 
     
-    // keep event if satisfies the selection cuts for at least one systematic variation
-    if(BaselineSelection::keep(mettst_syst, jets_syst, muons_syst, electrons_syst) || !isMC)
-      {
-	if(m_debug) std::cout << " passed baseline " << std::endl;
-	m_cut_flow[5]++;
-	pass_selection = true;
-	break;
+ // Clean up the systematics copies
+      if(sys_info.affectsKinematics) {
+	if(syst_affects_electrons) {
+	  delete electrons;
+	  delete electrons_aux;
+	}
+	if(syst_affects_muons) {
+	  delete muons;
+	  delete muons_aux;
+	}
+	if(syst_affects_jets) {
+	  delete jets;
+	  delete jets_aux;
+	}
+	delete metcst_syst;
+	delete metcst_syst_aux;
+	delete mettst_syst;
+	delete mettst_syst_aux;
+      }	
+      else {
+	delete mettst;
+	delete metcst;
       }
   } // end loop over systematics
   if(m_debug) std::cout << "End loop over systematics" << std::endl;
-	
+
   // Fill outputs for events which pass the selection
   if(pass_selection) {
+    m_cut_flow[5]++;
     if(m_doNTUP) {
       if(m_debug) std::cout << "recording ntuples" << std::endl;
       if(m_debug) std::cout << "start grabbing tree info" << std::endl;
@@ -846,8 +927,8 @@
       const xAOD::Vertex* pv = m_susy_tools->GetPrimVtx();
       float primary_vertex_z = pv ? pv->z() : 0;
       
-      if(m_debug) std::cout << " before tree fill standard " << std::endl;
-      
+      if(m_debug) std::cout << " before tree fill standard " << std::endl;   
+     
       m_tree_maker->Fill_obj(m_event_number,
 			     m_run_number,
 			     average_interactions_per_crossing,
@@ -860,8 +941,8 @@
 			     muons_nominal,
 			     electrons_nominal,
 			     jets_nominal,
-			     metcst,
-			     mettst,
+			     metcst_nominal,
+			     mettst_nominal,
 			     v_trigger,
 			     m_weight);
         if(m_debug) std::cout << "after tree fill standard " << std::endl;
@@ -942,10 +1023,14 @@
         if(m_debug) std::cout << "done with xAOD" << std::endl;
       }
   }
-    
-  // is_nominal = false;
-  CHECK( m_susy_tools->resetSystematics() );
 
+  delete electrons_nominal; 
+  delete electrons_nominal_aux; 
+  delete muons_nominal; 
+  delete muons_nominal_aux; 
+  delete jets_nominal; 
+  delete jets_nominal_aux; 
+
   if(m_debug) std::cout << "end of event!" << std::endl;
 
   return EL::StatusCode::SUCCESS;
@@ -988,12 +1073,6 @@
     m_grl = 0;
   }
 
-  // Pileup_Reweighting
-  if( m_pileup ) {
-    delete m_pileup;
-    m_pileup = 0;
-  }
-
   //SUSY ObjDef-xAOD
   if( m_susy_tools ) {
     delete m_susy_tools;
@@ -1018,6 +1097,10 @@
   h_cross_section_tree->Fill(0.5,m_cross_section);
   h_cross_section_tree->SetDirectory (file_tree); 
 
+  // output HistFitter input tree
+  TFile *file_histfitter = wk()->getOutputFile ("output_histfitter");
+  m_histfitter_input_maker->Write();
+
   // output xAOD
   TFile *file_xAOD = wk()->getOutputFile ("output_xAOD");
   event->finishWritingTo( file_xAOD );
Index: Root/ElectronHelper.cxx
===================================================================
--- Root/ElectronHelper.cxx	(revision 239543)
+++ Root/ElectronHelper.cxx	(revision 239606)
@@ -36,25 +36,15 @@
 //
 
 // Retreive the electron container and apply calibrations
-void ElectronHelper::RetrieveElectrons()
+void ElectronHelper::RetrieveElectrons(xAOD::ElectronContainer*& electrons, xAOD::ShallowAuxContainer*& electrons_aux, bool isNominal)
 {
-  xAOD::ElectronContainer*   electrons(0);
-  xAOD::ShallowAuxContainer* electrons_aux(0);
-
   // want to make sure these get passed to the SG, so we don't have to manage the memory ourselves.
-  m_susy_tools->GetElectrons(electrons,electrons_aux, true);
-  m_electrons_copy = electrons;
-  m_electrons_copy_aux = electrons_aux;
-  
+  m_susy_tools->GetElectrons(electrons,electrons_aux);//, true);
 
-  for(const auto & elec_itr : *m_electrons_copy) {
-    m_susy_tools->FillElectron( *elec_itr );
-
-    m_susy_tools->IsSignalElectron( *elec_itr );
-
-    // Different syntax for custom isolation in rel20
-    // Will set this soon if we need something custom
-    //m_susy_tools->IsSignalElectronExp( *elec_itr , ST::SignalIsoExp::IsoExp::MediumIso);
+  // Store only the nominal calibration
+  if(isNominal) {
+    m_electrons_copy = electrons;
+    m_electrons_copy_aux = electrons_aux;
   }
 }
 
@@ -62,27 +52,27 @@
 //
 
 // Apply kinematic and quality cuts
-void ElectronHelper::RetrieveSignalElectrons()
+void ElectronHelper::RetrieveSignalElectrons(xAOD::ElectronContainer*& electrons,xAOD::ShallowAuxContainer*& electrons_aux, bool isNominal)
 {
 
   ConstDataVector<xAOD::ElectronContainer> * selected_electrons =  new ConstDataVector<xAOD::ElectronContainer>(SG::VIEW_ELEMENTS);
 
   static SG::AuxElement::ConstAccessor< char > passOR("passOR");
 
-  for(const auto &elec : *m_electrons_copy) {
+  for(const auto &elec : *electrons) {
     if(!m_susy_tools->IsSignalElectron(*elec, 20000.)) continue;
 
     if(!passOR.isAvailable(*elec) || passOR(*elec) == 0) continue;    
- 
-    selected_electrons->push_back(elec);
+    
+    if(isNominal) selected_electrons->push_back(elec);
   }
-  m_store->record( selected_electrons, "SelectedElectrons" );
 
-  // sort in pT
-  std::sort(selected_electrons->begin(), selected_electrons->end(), HelperFunctions::pt_sort());
-
-  m_signal_electrons = selected_electrons->asDataVector();
-
+  if(isNominal) { 
+    m_store->record( selected_electrons, "SelectedElectrons" ); 
+    // sort in pT
+    std::sort(selected_electrons->begin(), selected_electrons->end(), HelperFunctions::pt_sort());
+    m_signal_electrons = selected_electrons->asDataVector();
+  }
 }
 
 //_________________________________________________________________________
Index: MultibjetsAnalysis/ElectronHelper.h
===================================================================
--- MultibjetsAnalysis/ElectronHelper.h	(revision 239543)
+++ MultibjetsAnalysis/ElectronHelper.h	(revision 239606)
@@ -26,9 +26,9 @@
   virtual ~ElectronHelper();
 
   // Retreive the electron container and apply calibrations
-  void RetrieveElectrons();
+  void RetrieveElectrons(xAOD::ElectronContainer*& electrons,xAOD::ShallowAuxContainer*& electrons_aux, bool isNominal=false);
   // Apply kinematic and quality cuts
-  void RetrieveSignalElectrons();
+  void RetrieveSignalElectrons(xAOD::ElectronContainer*& electrons,xAOD::ShallowAuxContainer*& electrons_aux, bool isNominal=false);
   // make deep copy of the electrons container in the output xAOD
   void MakeDeepCopy();
   
Index: MultibjetsAnalysis/MuonHelper.h
===================================================================
--- MultibjetsAnalysis/MuonHelper.h	(revision 239543)
+++ MultibjetsAnalysis/MuonHelper.h	(revision 239606)
@@ -26,9 +26,9 @@
   virtual ~MuonHelper();
 
  // Retreive the muon container and apply calibrations
-  void RetrieveMuons();
+  void RetrieveMuons(xAOD::MuonContainer*& muons,xAOD::ShallowAuxContainer*& muons_aux, bool isNominal=false);
   // Apply kinematic and quality cuts
-  void RetrieveSignalMuons();
+  void RetrieveSignalMuons(xAOD::MuonContainer*& muons,xAOD::ShallowAuxContainer*& muons_aux, bool isNominal=false);
   // make deep copy of the muons container in the output xAOD
   void MakeDeepCopy();
 
Index: MultibjetsAnalysis/JetHelper.h
===================================================================
--- MultibjetsAnalysis/JetHelper.h	(revision 239543)
+++ MultibjetsAnalysis/JetHelper.h	(revision 239606)
@@ -59,9 +59,9 @@
   void RetrieveClusters(const std::string& clus_key);
 
   // Retreive the jet container and apply calibrations
-  void RetrieveJets();
+  void RetrieveJets(xAOD::JetContainer*& jets,xAOD::ShallowAuxContainer*& jets_aux, bool isNominal=false);
   // Apply kinematic and quality cuts
-  void RetrieveSignalJets();
+  void RetrieveSignalJets(xAOD::JetContainer*& jets,xAOD::ShallowAuxContainer*& jets_aux, bool isNominal=false);
   void RetrieveSignalFatJets();
   // make deep copy of the jets container in the output xAOD
   void MakeDeepCopy(bool do_fat = false);
Index: MultibjetsAnalysis/HistFitterInputMaker.h
===================================================================
--- MultibjetsAnalysis/HistFitterInputMaker.h	(revision 0)
+++ MultibjetsAnalysis/HistFitterInputMaker.h	(revision 239606)
@@ -0,0 +1,48 @@
+
+#ifndef MultibjetsAnalysis_HistFitterInputMaker_h
+#define MultibjetsAnalysis_HistFitterInputMaker_h
+
+#include <TTree.h>
+#include <TFile.h>
+
+#include "PATInterfaces/SystematicSet.h"
+#include "SUSYTools/ISUSYObjDef_xAODTool.h"
+
+#include "MultibjetsAnalysis/MuonHelper.h"
+#include "MultibjetsAnalysis/ElectronHelper.h"
+#include "MultibjetsAnalysis/JetHelper.h"
+#include "MultibjetsAnalysis/TruthParticleHelper.h"
+#include <xAODMissingET/MissingET.h>
+
+class HistFitterInputMaker
+{
+    
+public:
+    
+  HistFitterInputMaker(TFile *file, std::vector<ST::SystInfo> sys_list);
+    virtual ~HistFitterInputMaker();
+    
+    void Fill(std::string sys_name,
+	      const xAOD::MuonContainer* v_muons,
+	      const xAOD::ElectronContainer* v_electrons,
+	      const xAOD::JetContainer* v_jets,
+	      const xAOD::MissingET* v_met,
+	      double weight[3]);
+    
+    void Write();
+    
+protected:
+    
+    void Reset();
+    
+    std::map<std::string, TTree*>   m_tree_map; //!
+    
+    Int_t m_muons_n; //!  
+    Int_t m_elecs_n; //!
+    Int_t m_jets_n;  //!
+    
+    Float_t m_met;  //!
+    Float_t m_meff; //!
+};
+
+#endif //MultibjetsAnalysis_TreeMaker_h

Property changes on: MultibjetsAnalysis/HistFitterInputMaker.h
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author HeadURL Id

Index: MultibjetsAnalysis/MainAnalysis.h
===================================================================
--- MultibjetsAnalysis/MainAnalysis.h	(revision 239543)
+++ MultibjetsAnalysis/MainAnalysis.h	(revision 239606)
@@ -40,10 +40,6 @@
   class xAODConfigTool;
 }
 
-namespace CP{
-  class PileupReweightingTool;
-}
-
 namespace ST{
   class SUSYObjDef_xAOD;
 }
@@ -54,6 +50,7 @@
 class TruthParticleHelper;
 class TruthJetHelper;
 class TreeMaker;
+class HistFitterInputMaker;
 
 class SubstructureTopTagger;
 
@@ -100,11 +97,11 @@
 
 #ifndef __CINT__
    GoodRunsListSelectionTool *m_grl;                //!
-   PileupReweightingTool     *m_pileup;             //!
    SUSYObjDef_xAOD           *m_susy_tools;         //!
    TrigDecisionTool          *m_trig_decision_tool; //!
    xAODConfigTool            *m_config_tool;        //!
    TreeMaker                 *m_tree_maker;         //!
+   HistFitterInputMaker      *m_histfitter_input_maker; //!
    OverlapRemovalTool        *m_or_tool;            //!
    FileMetaDataTool          *m_metadata_tool;      //!
    TriggerMenuMetaDataTool   *m_trigger_metadata_tool; //!
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 239543)
+++ ChangeLog	(revision 239606)
@@ -1,3 +1,14 @@
+2015-07-13 Antoine Marzin <[email protected]>
+	* fix memory leak 
+	* add submit scripts for SUSY10
+	* tag MultibjetsAnalysis-00-01-04
+	
+2015-07-11 Antoine Marzin <[email protected]>
+	* add HistFitter input maker
+	* fix treatment of systematic uncertainties
+	* move to AnalysisSUSY,2.3.18b
+	* tag MultibjetsAnalysis-00-01-03
+	
 2015-07-04 Antoine Marzin <[email protected]>
 	* update output tree to include all baseline objects (instead of only the signal ones)
 
Index: scripts/submit_st_SUSY10.py
===================================================================
--- scripts/submit_st_SUSY10.py	(revision 0)
+++ scripts/submit_st_SUSY10.py	(revision 239606)
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+import os
+
+# list of dataset to run with
+
+datasets = [
+'mc15_13TeV:mc15_13TeV.410011.PowhegPythiaEvtGen_P2012_singletop_tchan_lept_top.merge.DAOD_SUSY10.e3824_s2608_s2183_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.410012.PowhegPythiaEvtGen_P2012_singletop_tchan_lept_antitop.merge.DAOD_SUSY10.e3824_s2608_s2183_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.410025.PowhegPythiaEvtGen_P2012_SingleTopSchan_noAllHad_top.merge.DAOD_SUSY10.e3998_s2608_s2183_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.410026.PowhegPythiaEvtGen_P2012_SingleTopSchan_noAllHad_antitop.merge.DAOD_SUSY10.e3998_s2608_s2183_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.410013.PowhegPythiaEvtGen_P2012_Wt_inclusive_top.merge.DAOD_SUSY10.e3753_s2608_s2183_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.410014.PowhegPythiaEvtGen_P2012_Wt_inclusive_antitop.merge.DAOD_SUSY10.e3753_s2608_s2183_r6630_r6264_',
+]
+
+# Loop over datasets 
+for inds in datasets:
+    inds += "p2375/"
+    run = "ttbar"#inds[inds.find("13TeV.")+6:inds.find(".Herwigpp")]
+    cmd = 'python Run.py --doRcJets 0 --doTruth 0 --doAK10Jets 1  --dataSource 1  --submitDir %s --inputDS %s --driver grid' % (run,inds)
+    print cmd
+    os.system(cmd)
+    clean =  'rm -r %s' % (run)
+    os.system(clean)

Property changes on: scripts/submit_st_SUSY10.py
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Date Revision Author HeadURL Id

Index: scripts/submit_Gbb_SUSY10.py
===================================================================
--- scripts/submit_Gbb_SUSY10.py	(revision 0)
+++ scripts/submit_Gbb_SUSY10.py	(revision 239606)
@@ -0,0 +1,118 @@
+#!/usr/bin/env python
+import os
+
+# list of dataset to run with
+
+datasets = [
+'mc15_13TeV:mc15_13TeV.370250.MGPy8EG_A14N_GG_bbn1_900_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370252.MGPy8EG_A14N_GG_bbn1_900_5000_400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370253.MGPy8EG_A14N_GG_bbn1_900_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370254.MGPy8EG_A14N_GG_bbn1_900_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370255.MGPy8EG_A14N_GG_bbn1_900_5000_880.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370256.MGPy8EG_A14N_GG_bbn1_1000_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370257.MGPy8EG_A14N_GG_bbn1_1000_5000_200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370258.MGPy8EG_A14N_GG_bbn1_1000_5000_400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370259.MGPy8EG_A14N_GG_bbn1_1000_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370260.MGPy8EG_A14N_GG_bbn1_1000_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370261.MGPy8EG_A14N_GG_bbn1_1000_5000_980.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370262.MGPy8EG_A14N_GG_bbn1_1100_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370263.MGPy8EG_A14N_GG_bbn1_1100_5000_200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370265.MGPy8EG_A14N_GG_bbn1_1100_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370266.MGPy8EG_A14N_GG_bbn1_1100_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370267.MGPy8EG_A14N_GG_bbn1_1100_5000_1000.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370268.MGPy8EG_A14N_GG_bbn1_1100_5000_1080.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370269.MGPy8EG_A14N_GG_bbn1_1200_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370270.MGPy8EG_A14N_GG_bbn1_1200_5000_200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370271.MGPy8EG_A14N_GG_bbn1_1200_5000_400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370272.MGPy8EG_A14N_GG_bbn1_1200_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370273.MGPy8EG_A14N_GG_bbn1_1200_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370274.MGPy8EG_A14N_GG_bbn1_1200_5000_1000.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370275.MGPy8EG_A14N_GG_bbn1_1200_5000_1180.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370276.MGPy8EG_A14N_GG_bbn1_1300_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370277.MGPy8EG_A14N_GG_bbn1_1300_5000_200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370278.MGPy8EG_A14N_GG_bbn1_1300_5000_400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370279.MGPy8EG_A14N_GG_bbn1_1300_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370280.MGPy8EG_A14N_GG_bbn1_1300_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370282.MGPy8EG_A14N_GG_bbn1_1300_5000_1200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370283.MGPy8EG_A14N_GG_bbn1_1300_5000_1280.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370284.MGPy8EG_A14N_GG_bbn1_1400_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370285.MGPy8EG_A14N_GG_bbn1_1400_5000_200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370286.MGPy8EG_A14N_GG_bbn1_1400_5000_400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370287.MGPy8EG_A14N_GG_bbn1_1400_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370288.MGPy8EG_A14N_GG_bbn1_1400_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370289.MGPy8EG_A14N_GG_bbn1_1400_5000_1000.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370290.MGPy8EG_A14N_GG_bbn1_1400_5000_1200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370291.MGPy8EG_A14N_GG_bbn1_1400_5000_1380.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370292.MGPy8EG_A14N_GG_bbn1_1500_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370293.MGPy8EG_A14N_GG_bbn1_1500_5000_200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370294.MGPy8EG_A14N_GG_bbn1_1500_5000_400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370295.MGPy8EG_A14N_GG_bbn1_1500_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370296.MGPy8EG_A14N_GG_bbn1_1500_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370297.MGPy8EG_A14N_GG_bbn1_1500_5000_1000.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370298.MGPy8EG_A14N_GG_bbn1_1500_5000_1200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370299.MGPy8EG_A14N_GG_bbn1_1500_5000_1400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370300.MGPy8EG_A14N_GG_bbn1_1500_5000_1480.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370301.MGPy8EG_A14N_GG_bbn1_1600_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370302.MGPy8EG_A14N_GG_bbn1_1600_5000_200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370303.MGPy8EG_A14N_GG_bbn1_1600_5000_400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370304.MGPy8EG_A14N_GG_bbn1_1600_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370305.MGPy8EG_A14N_GG_bbn1_1600_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370306.MGPy8EG_A14N_GG_bbn1_1600_5000_1000.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370307.MGPy8EG_A14N_GG_bbn1_1600_5000_1200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370308.MGPy8EG_A14N_GG_bbn1_1600_5000_1400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370309.MGPy8EG_A14N_GG_bbn1_1600_5000_1580.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370310.MGPy8EG_A14N_GG_bbn1_1700_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370311.MGPy8EG_A14N_GG_bbn1_1700_5000_200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370312.MGPy8EG_A14N_GG_bbn1_1700_5000_400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370313.MGPy8EG_A14N_GG_bbn1_1700_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370314.MGPy8EG_A14N_GG_bbn1_1700_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370315.MGPy8EG_A14N_GG_bbn1_1700_5000_1000.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370316.MGPy8EG_A14N_GG_bbn1_1700_5000_1200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370317.MGPy8EG_A14N_GG_bbn1_1700_5000_1400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370318.MGPy8EG_A14N_GG_bbn1_1700_5000_1600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370319.MGPy8EG_A14N_GG_bbn1_1700_5000_1680.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370320.MGPy8EG_A14N_GG_bbn1_1800_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370321.MGPy8EG_A14N_GG_bbn1_1800_5000_200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370322.MGPy8EG_A14N_GG_bbn1_1800_5000_400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370323.MGPy8EG_A14N_GG_bbn1_1800_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370324.MGPy8EG_A14N_GG_bbn1_1800_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370325.MGPy8EG_A14N_GG_bbn1_1800_5000_1000.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370326.MGPy8EG_A14N_GG_bbn1_1800_5000_1200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370327.MGPy8EG_A14N_GG_bbn1_1800_5000_1400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370328.MGPy8EG_A14N_GG_bbn1_1800_5000_1600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370329.MGPy8EG_A14N_GG_bbn1_1800_5000_1780.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370330.MGPy8EG_A14N_GG_bbn1_1900_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370331.MGPy8EG_A14N_GG_bbn1_1900_5000_200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370332.MGPy8EG_A14N_GG_bbn1_1900_5000_400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370333.MGPy8EG_A14N_GG_bbn1_1900_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370334.MGPy8EG_A14N_GG_bbn1_1900_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370335.MGPy8EG_A14N_GG_bbn1_1900_5000_1000.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370336.MGPy8EG_A14N_GG_bbn1_1900_5000_1200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370337.MGPy8EG_A14N_GG_bbn1_1900_5000_1400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370338.MGPy8EG_A14N_GG_bbn1_1900_5000_1600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370339.MGPy8EG_A14N_GG_bbn1_1900_5000_1800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370340.MGPy8EG_A14N_GG_bbn1_1900_5000_1880.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370341.MGPy8EG_A14N_GG_bbn1_2000_5000_1.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370342.MGPy8EG_A14N_GG_bbn1_2000_5000_200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370343.MGPy8EG_A14N_GG_bbn1_2000_5000_400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370344.MGPy8EG_A14N_GG_bbn1_2000_5000_600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370345.MGPy8EG_A14N_GG_bbn1_2000_5000_800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370346.MGPy8EG_A14N_GG_bbn1_2000_5000_1000.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370347.MGPy8EG_A14N_GG_bbn1_2000_5000_1200.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370348.MGPy8EG_A14N_GG_bbn1_2000_5000_1400.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370349.MGPy8EG_A14N_GG_bbn1_2000_5000_1600.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370350.MGPy8EG_A14N_GG_bbn1_2000_5000_1800.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+'mc15_13TeV:mc15_13TeV.370351.MGPy8EG_A14N_GG_bbn1_2000_5000_1980.merge.DAOD_SUSY10.e4050_a766_a768_r6282_',
+    ]
+
+# Loop over datasets 
+for inds in datasets:
+    inds += "p2375/"
+    run = "Gbb"
+    cmd = 'python Run.py --doTruth 0 --doRcJets 0 --doAK10Jets 0  --dataSource 2  --submitDir %s --inputDS %s --driver grid' % (run,inds)
+    print cmd
+    os.system(cmd)
+    clean =  'rm -r %s' % (run)
+    os.system(clean)
+
+

Property changes on: scripts/submit_Gbb_SUSY10.py
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author HeadURL Id

Index: scripts/send_all.sh
===================================================================
--- scripts/send_all.sh	(revision 239543)
+++ scripts/send_all.sh	(revision 239606)
@@ -1,14 +1,20 @@
 
 #!/bin/bash
 
-python submit_st_SUSY1.py
+python submit_st_SUSY10.py
 
-python submit_ttbar_SUSY1.py
+python submit_topEW_SUSY10.py
 
-python  submit_data_SUSY1.py
+python submit_ttbar_SUSY10.py
 
-python  submit_Z_SUSY1.py
+python  submit_data_SUSY10.py
 
-python  submit_W_SUSY1.py
+python  submit_Z_SUSY10.py
 
-python  submit_dijet_SUSY1.py
+python  submit_W_SUSY10.py
+
+python  submit_dijet_SUSY10.py
+
+python submit_Gtt_SUSY10.py
+
+python submit_Gbb_SUSY10.py
Index: scripts/Run.py
===================================================================
--- scripts/Run.py	(revision 239543)
+++ scripts/Run.py	(revision 239606)
@@ -18,8 +18,8 @@
 # input configuration
 parser.add_option("--dataSource", help="undefined=-1, data=0, FullSim=1, AF-II=2 ", type="int", default=1)
 # electron configuration
-parser.add_option("--EleIdSignal", help="signal electron id", default="MediumLLH")
-parser.add_option("--EleIdBaseline", help="baseline electron id", default="LooseLLH")
+parser.add_option("--EleIdSignal", help="signal electron id", default="TightLH")
+parser.add_option("--EleIdBaseline", help="baseline electron id", default="LooseLH")
 # jet configuration
 parser.add_option("--doJetArea", help="DoJetArea flag [0/1]", type="int", default=1)
 parser.add_option("--doJetGSC", help="DoJetGCS flag [0/1]", type="int", default=1)
@@ -31,7 +31,7 @@
 parser.add_option("--doNTUP", help="Make flat ntuple output [0/1]", type="int", default=1)
 parser.add_option("--doxAOD", help="Make xAOD output [0/1]", type="int", default=1)
 parser.add_option("--doRcJets", help="DoRcJets flag [0/1]", type="int", default=0)
-parser.add_option("--doAK10Jets", help="DoAK10Jets flag [0/1]", type="int", default=0)
+parser.add_option("--doAK10Jets", help="DoAK10Jets flag [0/1]", type="int", default=1)
 parser.add_option("--debug", help="Debug mode: print extra stuff [0/1]", type="int", default=0)
 
 (options, args) = parser.parse_args()
@@ -138,8 +138,7 @@
 elif (options.driver == "grid"):
     logging.info("running on Grid")
     driver = ROOT.EL.PrunDriver()   
-    driver.options().setString("nc_outputSampleName", "user.%nickname%.%in:name[2]%.%in:name[5]%.%in:name[6]%_20")
-    #driver.options().setString("nc_outputSampleName", "user.%nickname%.%in:name[2]%.%in:name[5]%.%in:name[6]%_21")
+    driver.options().setString("nc_outputSampleName", "user.%nickname%.%in:name[2]%.%in:name[3]%.%in:name[5]%_25")
     driver.options().setDouble("nc_nGBPerJob", 2)
     #driver.options().setDouble("nc_disableAutoRetry", 1)
     #driver.options().setString("nc_cmtConfig", "x86_64-slc6-gcc48-opt")
@@ -147,6 +146,6 @@
     #driver.options().setString("nc_excludedSite", "TRIUMF-LCG2_DATADISK")
     #driver.options().setString("nc_EventLoop_SubmitFlags", "--allowTaskDuplication");
     # driver.options().setString("EL::Job::optGridDestSE","CERN-PROD_LOCALGROUPDISK")
-    # driver.options().setString("nc_optGridDestSE","CERN-PROD_LOCALGROUPDISK")
+    driver.options().setString("nc_optGridDestSE","CERN-PROD_LOCALGROUPDISK")
     logging.info("submit job")
     driver.submitOnly(job, options.submitDir)
Index: scripts/submit_topEW_SUSY10.py
===================================================================
--- scripts/submit_topEW_SUSY10.py	(revision 0)
+++ scripts/submit_topEW_SUSY10.py	(revision 239606)
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+import os
+
+# list of dataset to run with
+
+datasets = [
+'mc15_13TeV:mc15_13TeV.341177.aMcAtNloHerwigppEvtGen_UEEE5_CTEQ6L1_CT10ME_ttH125_inc.merge.DAOD_SUSY10.e3921_s2608_s2183_r6630_r6264_',
+]
+
+# Loop over datasets 
+for inds in datasets:
+    inds += "p2375/"
+    run = "ttbar"#inds[inds.find("13TeV.")+6:inds.find(".Herwigpp")]
+    cmd = 'python Run.py --doRcJets 0 --doTruth 0 --doAK10Jets 1  --dataSource 1  --submitDir %s --inputDS %s --driver grid' % (run,inds)
+    print cmd
+    os.system(cmd)
+    clean =  'rm -r %s' % (run)
+    os.system(clean)

Property changes on: scripts/submit_topEW_SUSY10.py
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Date Revision Author HeadURL Id

Index: scripts/submit_Gtt_SUSY10.py
===================================================================
--- scripts/submit_Gtt_SUSY10.py	(revision 0)
+++ scripts/submit_Gtt_SUSY10.py	(revision 239606)
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+import os
+
+# list of dataset to run with
+
+datasets = [
+'mc15_13TeV:mc15_13TeV.370102.MGPy8EG_A14N_GG_ttn1_900_5000_400.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370103.MGPy8EG_A14N_GG_ttn1_900_5000_545.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370107.MGPy8EG_A14N_GG_ttn1_1000_5000_600.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370112.MGPy8EG_A14N_GG_ttn1_1100_5000_600.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370114.MGPy8EG_A14N_GG_ttn1_1200_5000_1.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370117.MGPy8EG_A14N_GG_ttn1_1200_5000_400.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370118.MGPy8EG_A14N_GG_ttn1_1200_5000_600.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370119.MGPy8EG_A14N_GG_ttn1_1200_5000_700.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370120.MGPy8EG_A14N_GG_ttn1_1200_5000_800.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370122.MGPy8EG_A14N_GG_ttn1_1200_5000_855.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370124.MGPy8EG_A14N_GG_ttn1_1300_5000_200.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370125.MGPy8EG_A14N_GG_ttn1_1300_5000_400.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370126.MGPy8EG_A14N_GG_ttn1_1300_5000_600.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370130.MGPy8EG_A14N_GG_ttn1_1400_5000_100.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370133.MGPy8EG_A14N_GG_ttn1_1400_5000_600.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370154.MGPy8EG_A14N_GG_ttn1_1700_5000_400.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370156.MGPy8EG_A14N_GG_ttn1_1700_5000_800.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370167.MGPy8EG_A14N_GG_ttn1_1800_5000_1400.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370173.MGPy8EG_A14N_GG_ttn1_1900_5000_800.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+'mc15_13TeV:mc15_13TeV.370177.MGPy8EG_A14N_GG_ttn1_1900_5000_1545.merge.DAOD_SUSY10.e4049_s2608_r6765_r6282_',
+            ]
+
+# Loop over datasets 
+for inds in datasets:
+    inds += "p2375/"
+    run = "Gtt"#inds[inds.find("13TeV.")+6:inds.find(".Herwigpp")]
+    cmd = 'python Run.py --doTruth 0 --doRcJets 0 --doAK10Jets 1  --dataSource 1  --submitDir %s --inputDS %s --driver grid' % (run,inds)
+    print cmd
+    os.system(cmd)
+    clean =  'rm -r %s' % (run)
+    os.system(clean)
+ 

Property changes on: scripts/submit_Gtt_SUSY10.py
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Date Revision Author HeadURL Id

Index: scripts/submit_dijet_SUSY10.py
===================================================================
--- scripts/submit_dijet_SUSY10.py	(revision 0)
+++ scripts/submit_dijet_SUSY10.py	(revision 239606)
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+import os
+
+# list of dataset to run with
+
+datasets = [
+'mc15_13TeV:mc15_13TeV.361020.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ0W.merge.DAOD_SUSY10.e3569_s2576_s2132_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361021.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ1W.merge.DAOD_SUSY10.e3569_s2576_s2132_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.merge.DAOD_SUSY10.e3668_s2576_s2132_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361023.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ3W.merge.DAOD_SUSY10.e3668_s2576_s2132_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361024.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ4W.merge.DAOD_SUSY10.e3668_s2576_s2132_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361025.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ5W.merge.DAOD_SUSY10.e3668_s2576_s2132_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361026.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ6W.merge.DAOD_SUSY10.e3569_s2608_s2183_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361027.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ7W.merge.DAOD_SUSY10.e3668_s2608_s2183_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361028.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ8W.merge.DAOD_SUSY10.e3569_s2576_s2132_r6630_r6264_',
+]
+
+# Loop over datasets 
+for inds in datasets:
+    inds += "p2375/"
+    run = "ttbar"#inds[inds.find("13TeV.")+6:inds.find(".Herwigpp")]
+    cmd = 'python Run.py --doRcJets 0 --doTruth 0 --doAK10Jets 1  --dataSource 1  --submitDir %s --inputDS %s --driver grid' % (run,inds)
+    print cmd
+    os.system(cmd)
+    clean =  'rm -r %s' % (run)
+    os.system(clean)

Property changes on: scripts/submit_dijet_SUSY10.py
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Date Revision Author HeadURL Id

Index: scripts/submit_W_SUSY10.py
===================================================================
--- scripts/submit_W_SUSY10.py	(revision 0)
+++ scripts/submit_W_SUSY10.py	(revision 239606)
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+import os
+
+# list of dataset to run with
+
+datasets = [
+'mc15_13TeV:mc15_13TeV.361300.Sherpa_CT10_Wenu_Pt0_70_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361301.Sherpa_CT10_Wenu_Pt0_70_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361302.Sherpa_CT10_Wenu_Pt0_70_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361303.Sherpa_CT10_Wenu_Pt70_140_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361304.Sherpa_CT10_Wenu_Pt70_140_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361305.Sherpa_CT10_Wenu_Pt70_140_BFilter.merge.DAOD_SUSY10.e3651_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361306.Sherpa_CT10_Wenu_Pt140_280_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361307.Sherpa_CT10_Wenu_Pt140_280_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361308.Sherpa_CT10_Wenu_Pt140_280_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361309.Sherpa_CT10_Wenu_Pt280_500_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361310.Sherpa_CT10_Wenu_Pt280_500_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361311.Sherpa_CT10_Wenu_Pt280_500_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361312.Sherpa_CT10_Wenu_Pt500_700_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361313.Sherpa_CT10_Wenu_Pt500_700_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361314.Sherpa_CT10_Wenu_Pt500_700_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361320.Sherpa_CT10_Wenu_Pt1000_2000_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361321.Sherpa_CT10_Wenu_Pt2000_E_CMS_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361322.Sherpa_CT10_Wenu_Pt2000_E_CMS_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361323.Sherpa_CT10_Wenu_Pt2000_E_CMS_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361324.Sherpa_CT10_Wmunu_Pt0_70_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2608_s2183_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361325.Sherpa_CT10_Wmunu_Pt0_70_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361327.Sherpa_CT10_Wmunu_Pt70_140_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361328.Sherpa_CT10_Wmunu_Pt70_140_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361329.Sherpa_CT10_Wmunu_Pt70_140_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361330.Sherpa_CT10_Wmunu_Pt140_280_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361331.Sherpa_CT10_Wmunu_Pt140_280_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361332.Sherpa_CT10_Wmunu_Pt140_280_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361333.Sherpa_CT10_Wmunu_Pt280_500_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361334.Sherpa_CT10_Wmunu_Pt280_500_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361335.Sherpa_CT10_Wmunu_Pt280_500_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361336.Sherpa_CT10_Wmunu_Pt500_700_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361337.Sherpa_CT10_Wmunu_Pt500_700_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361338.Sherpa_CT10_Wmunu_Pt500_700_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361344.Sherpa_CT10_Wmunu_Pt1000_2000_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361345.Sherpa_CT10_Wmunu_Pt2000_E_CMS_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361346.Sherpa_CT10_Wmunu_Pt2000_E_CMS_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361347.Sherpa_CT10_Wmunu_Pt2000_E_CMS_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361348.Sherpa_CT10_Wtaunu_Pt0_70_CVetoBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361349.Sherpa_CT10_Wtaunu_Pt0_70_CFilterBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361350.Sherpa_CT10_Wtaunu_Pt0_70_BFilter.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361351.Sherpa_CT10_Wtaunu_Pt70_140_CVetoBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361352.Sherpa_CT10_Wtaunu_Pt70_140_CFilterBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361353.Sherpa_CT10_Wtaunu_Pt70_140_BFilter.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361354.Sherpa_CT10_Wtaunu_Pt140_280_CVetoBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361355.Sherpa_CT10_Wtaunu_Pt140_280_CFilterBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361356.Sherpa_CT10_Wtaunu_Pt140_280_BFilter.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361357.Sherpa_CT10_Wtaunu_Pt280_500_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361358.Sherpa_CT10_Wtaunu_Pt280_500_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361359.Sherpa_CT10_Wtaunu_Pt280_500_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361360.Sherpa_CT10_Wtaunu_Pt500_700_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361361.Sherpa_CT10_Wtaunu_Pt500_700_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361362.Sherpa_CT10_Wtaunu_Pt500_700_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361363.Sherpa_CT10_Wtaunu_Pt700_1000_CVetoBVeto.merge.DAOD_SUSY10.e3973_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361364.Sherpa_CT10_Wtaunu_Pt700_1000_CFilterBVeto.merge.DAOD_SUSY10.e3973_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361365.Sherpa_CT10_Wtaunu_Pt700_1000_BFilter.merge.DAOD_SUSY10.e3973_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361368.Sherpa_CT10_Wtaunu_Pt1000_2000_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361369.Sherpa_CT10_Wtaunu_Pt2000_E_CMS_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361370.Sherpa_CT10_Wtaunu_Pt2000_E_CMS_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361371.Sherpa_CT10_Wtaunu_Pt2000_E_CMS_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+           ]
+
+# Loop over datasets 
+for inds in datasets:
+    inds += "p2375/"
+    run = "W"#inds[inds.find("13TeV.")+6:inds.find(".Herwigpp")]
+    cmd = 'python Run.py --doRcJets 0 --doAK10Jets 1 --doTruth 0  --dataSource 1 --submitDir %s --inputDS %s --driver grid' % (run,inds)
+    print cmd
+    os.system(cmd)
+    clean =  'rm -r %s' % (run)
+    os.system(clean)

Property changes on: scripts/submit_W_SUSY10.py
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Date Revision Author HeadURL Id

Index: scripts/submit_Z_SUSY10.py
===================================================================
--- scripts/submit_Z_SUSY10.py	(revision 0)
+++ scripts/submit_Z_SUSY10.py	(revision 239606)
@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+import os
+
+# list of dataset to run with
+
+datasets = [
+'mc15_13TeV:mc15_13TeV.361372.Sherpa_CT10_Zee_Pt0_70_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361373.Sherpa_CT10_Zee_Pt0_70_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361374.Sherpa_CT10_Zee_Pt0_70_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361375.Sherpa_CT10_Zee_Pt70_140_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361376.Sherpa_CT10_Zee_Pt70_140_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361377.Sherpa_CT10_Zee_Pt70_140_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361378.Sherpa_CT10_Zee_Pt140_280_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361379.Sherpa_CT10_Zee_Pt140_280_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361380.Sherpa_CT10_Zee_Pt140_280_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361381.Sherpa_CT10_Zee_Pt280_500_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361382.Sherpa_CT10_Zee_Pt280_500_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361383.Sherpa_CT10_Zee_Pt280_500_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361384.Sherpa_CT10_Zee_Pt500_700_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361385.Sherpa_CT10_Zee_Pt500_700_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361391.Sherpa_CT10_Zee_Pt1000_2000_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361392.Sherpa_CT10_Zee_Pt1000_2000_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361393.Sherpa_CT10_Zee_Pt2000_E_CMS_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361394.Sherpa_CT10_Zee_Pt2000_E_CMS_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361395.Sherpa_CT10_Zee_Pt2000_E_CMS_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361396.Sherpa_CT10_Zmumu_Pt0_70_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361397.Sherpa_CT10_Zmumu_Pt0_70_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361398.Sherpa_CT10_Zmumu_Pt0_70_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361399.Sherpa_CT10_Zmumu_Pt70_140_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361400.Sherpa_CT10_Zmumu_Pt70_140_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361401.Sherpa_CT10_Zmumu_Pt70_140_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361402.Sherpa_CT10_Zmumu_Pt140_280_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2608_s2183_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361403.Sherpa_CT10_Zmumu_Pt140_280_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361404.Sherpa_CT10_Zmumu_Pt140_280_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361405.Sherpa_CT10_Zmumu_Pt280_500_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361406.Sherpa_CT10_Zmumu_Pt280_500_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361407.Sherpa_CT10_Zmumu_Pt280_500_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361408.Sherpa_CT10_Zmumu_Pt500_700_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361409.Sherpa_CT10_Zmumu_Pt500_700_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361415.Sherpa_CT10_Zmumu_Pt1000_2000_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361416.Sherpa_CT10_Zmumu_Pt1000_2000_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361417.Sherpa_CT10_Zmumu_Pt2000_E_CMS_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361418.Sherpa_CT10_Zmumu_Pt2000_E_CMS_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361419.Sherpa_CT10_Zmumu_Pt2000_E_CMS_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361420.Sherpa_CT10_Ztautau_Pt0_70_CVetoBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361421.Sherpa_CT10_Ztautau_Pt0_70_CFilterBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361422.Sherpa_CT10_Ztautau_Pt0_70_BFilter.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361423.Sherpa_CT10_Ztautau_Pt70_140_CVetoBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361424.Sherpa_CT10_Ztautau_Pt70_140_CFilterBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361425.Sherpa_CT10_Ztautau_Pt70_140_BFilter.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361426.Sherpa_CT10_Ztautau_Pt140_280_CVetoBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361427.Sherpa_CT10_Ztautau_Pt140_280_CFilterBVeto.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361428.Sherpa_CT10_Ztautau_Pt140_280_BFilter.merge.DAOD_SUSY10.e3733_s2608_s2183_r6767_r6264_',
+'mc15_13TeV:mc15_13TeV.361429.Sherpa_CT10_Ztautau_Pt280_500_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361430.Sherpa_CT10_Ztautau_Pt280_500_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361431.Sherpa_CT10_Ztautau_Pt280_500_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361432.Sherpa_CT10_Ztautau_Pt500_700_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361433.Sherpa_CT10_Ztautau_Pt500_700_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361439.Sherpa_CT10_Ztautau_Pt1000_2000_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361440.Sherpa_CT10_Ztautau_Pt1000_2000_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361441.Sherpa_CT10_Ztautau_Pt2000_E_CMS_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361442.Sherpa_CT10_Ztautau_Pt2000_E_CMS_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361443.Sherpa_CT10_Ztautau_Pt2000_E_CMS_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361444.Sherpa_CT10_Znunu_Pt0_70_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2608_s2183_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361445.Sherpa_CT10_Znunu_Pt0_70_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361446.Sherpa_CT10_Znunu_Pt0_70_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361447.Sherpa_CT10_Znunu_Pt70_140_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361448.Sherpa_CT10_Znunu_Pt70_140_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361449.Sherpa_CT10_Znunu_Pt70_140_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361450.Sherpa_CT10_Znunu_Pt140_280_CVetoBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361451.Sherpa_CT10_Znunu_Pt140_280_CFilterBVeto.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361452.Sherpa_CT10_Znunu_Pt140_280_BFilter.merge.DAOD_SUSY10.e3651_s2586_s2174_r6630_r6264_',
+'mc15_13TeV:mc15_13TeV.361453.Sherpa_CT10_Znunu_Pt280_500_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361454.Sherpa_CT10_Znunu_Pt280_500_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361455.Sherpa_CT10_Znunu_Pt280_500_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361456.Sherpa_CT10_Znunu_Pt500_700_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361457.Sherpa_CT10_Znunu_Pt500_700_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361458.Sherpa_CT10_Znunu_Pt500_700_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361459.Sherpa_CT10_Znunu_Pt700_1000_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6793_r6264_',
+'mc15_13TeV:mc15_13TeV.361463.Sherpa_CT10_Znunu_Pt1000_2000_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361464.Sherpa_CT10_Znunu_Pt1000_2000_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361465.Sherpa_CT10_Znunu_Pt2000_E_CMS_CVetoBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361466.Sherpa_CT10_Znunu_Pt2000_E_CMS_CFilterBVeto.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+'mc15_13TeV:mc15_13TeV.361467.Sherpa_CT10_Znunu_Pt2000_E_CMS_BFilter.merge.DAOD_SUSY10.e3741_s2608_s2183_r6802_r6264_',
+        ]
+
+# Loop over datasets 
+for inds in datasets:
+    inds += "p2375/"
+    run = "ttbar"#inds[inds.find("13TeV.")+6:inds.find(".Herwigpp")]
+    cmd = 'python Run.py --doRcJets 0 --doAK10Jets 1 --doTruth 0  --dataSource 1 --submitDir %s --inputDS %s --driver grid' % (run,inds)
+    print cmd
+    os.system(cmd)
+    clean =  'rm -r %s' % (run)
+    os.system(clean)

Property changes on: scripts/submit_Z_SUSY10.py
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Date Revision Author HeadURL Id

Index: scripts/submit_data_SUSY10.py
===================================================================
--- scripts/submit_data_SUSY10.py	(revision 0)
+++ scripts/submit_data_SUSY10.py	(revision 239606)
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+import os
+
+# list of dataset to run with
+ 
+datasets = [
+'data15_13TeV:data15_13TeV.00267638.physics_Main.merge.DAOD_SUSY10.r6848_p2358_',
+'data15_13TeV:data15_13TeV.00267639.physics_Main.merge.DAOD_SUSY10.r6848_p2358_',
+'data15_13TeV:data15_13TeV.00270441.physics_Main.merge.DAOD_SUSY10.f610_m1458_',
+'data15_13TeV:data15_13TeV.00270448.physics_Main.merge.DAOD_SUSY10.f610_m1458_',
+'data15_13TeV:data15_13TeV.00270588.physics_Main.merge.DAOD_SUSY10.f610_m1458_',
+'data15_13TeV:data15_13TeV.00270806.physics_Main.merge.DAOD_SUSY10.f611_m1463_',
+'data15_13TeV:data15_13TeV.00271044.physics_Main.merge.DAOD_SUSY10.f611_m1463_',
+]
+
+# Loop over datasets 
+for inds in datasets:
+    inds += "p2375/"
+    run = "ttbar"#inds[inds.find("13TeV.")+6:inds.find(".Herwigpp")]
+    cmd = 'python Run.py --doPileup 0  --doRcJets 0 --doTruth 0 --doAK10Jets 1  --dataSource 0  --submitDir %s --inputDS %s --driver grid' % (run,inds)
+    print cmd
+    os.system(cmd)
+    clean =  'rm -r %s' % (run)
+    os.system(clean)

Property changes on: scripts/submit_data_SUSY10.py
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Date Revision Author HeadURL Id

Index: scripts/submit_ttbar_SUSY10.py
===================================================================
--- scripts/submit_ttbar_SUSY10.py	(revision 0)
+++ scripts/submit_ttbar_SUSY10.py	(revision 239606)
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+import os
+
+# list of dataset to run with
+
+datasets = [
+'mc15_13TeV:mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.DAOD_SUSY10.e3698_s2608_s2183_r6630_r6264_p2375/',
+#'mc15_13TeV:mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.DAOD_SUSY10.e3698_a766_a767_r6264_p2375/',
+]
+
+# Loop over datasets 
+for inds in datasets:
+    inds += ""
+    run = "ttbar"#inds[inds.find("13TeV.")+6:inds.find(".Herwigpp")]
+    cmd = 'python Run.py --doRcJets 0 --doTruth 1 --doAK10Jets 1  --dataSource 1  --submitDir %s --inputDS %s --driver grid' % (run,inds)
+    print cmd
+    os.system(cmd)
+    clean =  'rm -r %s' % (run)
+    os.system(clean)

Property changes on: scripts/submit_ttbar_SUSY10.py
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Date Revision Author HeadURL Id

Index: data/prw_week1.test.root
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: data/prw_week1.test.root
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: data/ilumicalc_histograms_None_266904-267639.root
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: data/ilumicalc_histograms_None_266904-267639.root
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: packages.txt
===================================================================
--- packages.txt	(revision 239543)
+++ packages.txt	(revision 239606)
@@ -1,12 +1,12 @@
 # SUSYTools
-#atlasoff/PhysicsAnalysis/SUSYPhys/SUSYTools/tags/SUSYTools-00-06-12
-atlasoff/PhysicsAnalysis/AnalysisCommon/AssociationUtils/tags/AssociationUtils-01-00-18 
+#atlasoff/PhysicsAnalysis/SUSYPhys/SUSYTools/tags/SUSYTools-00-06-15
+#atlasoff/PhysicsAnalysis/AnalysisCommon/AssociationUtils/tags/AssociationUtils-01-00-18 
 atlasoff/Event/xAOD/xAODMetaDataCnv/tags/xAODMetaDataCnv-00-00-01
 atlasoff/Event/xAOD/xAODTriggerCnv/devbranches/xAODTriggerCnv-00-00-13-metamerge
-atlasoff/Control/xAODRootAccess/tags/xAODRootAccess-00-01-11
-atlasoff/Control/AthToolSupport/AsgTools/tags/AsgTools-00-00-43
+#atlasoff/Control/xAODRootAccess/tags/xAODRootAccess-00-01-11
+#atlasoff/Control/AthToolSupport/AsgTools/tags/AsgTools-00-00-43
 atlasoff/Event/xAOD/xAODMetaData/tags/xAODMetaData-00-00-04
-atlasoff/PhysicsAnalysis/D3PDTools/EventLoop/tags/EventLoop-00-01-13
-atlasoff/PhysicsAnalysis/D3PDTools/EventLoopGrid/tags/EventLoopGrid-00-00-38
+#atlasoff/PhysicsAnalysis/D3PDTools/EventLoop/tags/EventLoop-00-01-13
+#atlasoff/PhysicsAnalysis/D3PDTools/EventLoopGrid/tags/EventLoopGrid-00-00-38
 atlasoff/Event/xAOD/xAODCore/tags/xAODCore-00-01-03
 atlasperf/CombPerf/JetETMiss/TopTagPreRecPUB2015/code/SubstructureTopTagger
Index: README
===================================================================
--- README	(revision 239543)
+++ README	(revision 239606)
@@ -21,7 +21,7 @@
 compile
 ========
  
-rcSetup SUSY,2.3.15a
+rcSetup SUSY,2.3.18b
 
 rc find_packages
 rc clean
@@ -82,4 +82,4 @@
 make a new tag
 ================
 
-svn cp . $SVNPHYS/Physics/SUSY/Analyses/MultiBJets/MultibjetsAnalysis/tags/MultibjetsAnalysis-00-01-02 -m "Tagging MultibjetsAnalysis-00-01-02"
+svn cp . $SVNPHYS/Physics/SUSY/Analyses/MultiBJets/MultibjetsAnalysis/tags/MultibjetsAnalysis-00-01-04 -m "Tagging MultibjetsAnalysis-00-01-04"