Merge pull request cms-sw#5287 from inugent/SpinUPforTauola_7_2_X_V2

GeneratorInterface -- Spin u pfor tauola 7 2 x v2 Resolved Conflicts: GeneratorInterface/Core/interface/HadronizerFilter.h GeneratorInterface/ExternalDecays/src/ExternalDecayDriver.cc
bendavid · Jan 25, 2015 · 27da60d · 27da60d
1 parent 8bbb812
commit 27da60d
Show file tree

Hide file tree

Showing 15 changed files with 1,328 additions and 352 deletions.
diff --git a/GeneratorInterface/Core/interface/HadronizerFilter.h b/GeneratorInterface/Core/interface/HadronizerFilter.h
@@ -217,7 +217,7 @@ namespace edm
       //
       if ( decayer_ ) 
       {
-        event.reset( decayer_->decay( event.get() ) );
+        event.reset( decayer_->decay( event.get(),lheEvent ) );
       }
 
       if ( !event.get() ) continue;

diff --git a/GeneratorInterface/ExternalDecays/BuildFile.xml b/GeneratorInterface/ExternalDecays/BuildFile.xml
@@ -8,6 +8,7 @@
 <use name="clhep"/>
 <use name="hepmc"/>
 <use name="GeneratorInterface/Core"/>
+<use   name="GeneratorInterface/LHEInterface"/>
 <use name="GeneratorInterface/EvtGenInterface"/>
 <use name="GeneratorInterface/PhotosInterface"/>
 <use name="GeneratorInterface/TauolaInterface"/>

diff --git a/GeneratorInterface/ExternalDecays/interface/ExternalDecayDriver.h b/GeneratorInterface/ExternalDecays/interface/ExternalDecayDriver.h
@@ -16,6 +16,10 @@ namespace CLHEP {
    class HepRandomEngine;
 }
 
+namespace lhef { 
+  class LHEEvent;
+}
+
 namespace gen {
 
   class EvtGenInterfaceBase;
@@ -35,15 +39,15 @@ namespace gen {
 	 const std::vector<int>&         operatesOnParticles() { return fPDGs; }
 	 const std::vector<std::string>& specialSettings()     { return fSpecialSettings; }
 
-	 HepMC::GenEvent* decay( HepMC::GenEvent* );
-
+	 HepMC::GenEvent* decay( HepMC::GenEvent* evt);
+	 HepMC::GenEvent* decay( HepMC::GenEvent* evt, lhef::LHEEvent *lheEvent);
+
 	 void statistics() const;
 
          void setRandomEngine(CLHEP::HepRandomEngine*);
          std::vector<std::string> const& sharedResources() const { return exSharedResources; }
 
       private:
-
 	 bool                     fIsInitialized;
 	 TauolaInterfaceBase*     fTauolaInterface;
 	 EvtGenInterfaceBase*     fEvtGenInterface;

diff --git a/GeneratorInterface/ExternalDecays/src/ExternalDecayDriver.cc b/GeneratorInterface/ExternalDecays/src/ExternalDecayDriver.cc
@@ -78,6 +78,10 @@ ExternalDecayDriver::~ExternalDecayDriver()
 }
 
 
+HepMC::GenEvent* ExternalDecayDriver::decay(HepMC::GenEvent* evt, lhef::LHEEvent *lheEvent){
+  if(fTauolaInterface) fTauolaInterface->SetLHE(lheEvent);
+  return decay(evt);
+}
 HepMC::GenEvent* ExternalDecayDriver::decay( HepMC::GenEvent* evt )
 {
    if ( !fIsInitialized ) return evt;

diff --git a/GeneratorInterface/TauolaInterface/BuildFile.xml b/GeneratorInterface/TauolaInterface/BuildFile.xml
@@ -1,6 +1,7 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/PluginManager"/>
+<use name="GeneratorInterface/LHEInterface"/>
 <use name="hepmc"/>
 <use name="clhep"/>
 <use name="heppdt"/>

diff --git a/GeneratorInterface/TauolaInterface/interface/TauolaInterfaceBase.h b/GeneratorInterface/TauolaInterface/interface/TauolaInterfaceBase.h
@@ -7,11 +7,19 @@
 #include <vector>
 #include "CLHEP/Random/RandomEngine.h"
 
+// LHE Run
+#include "SimDataFormats/GeneratorProducts/interface/LHERunInfoProduct.h"
+#include "GeneratorInterface/LHEInterface/interface/LHERunInfo.h"
+
+// LHE Event
+#include "SimDataFormats/GeneratorProducts/interface/LHEEventProduct.h"
+#include "GeneratorInterface/LHEInterface/interface/LHEEvent.h"
+
 namespace gen {
    class TauolaInterfaceBase {
    public:
      TauolaInterfaceBase(){};
-     TauolaInterfaceBase( const edm::ParameterSet&){};
+   TauolaInterfaceBase( const edm::ParameterSet&){};
      virtual ~TauolaInterfaceBase(){};
 
      virtual void SetDecayRandomEngine(CLHEP::HepRandomEngine* decayRandomEngine){};
@@ -22,10 +30,10 @@ namespace gen {
      virtual HepMC::GenEvent* decay( HepMC::GenEvent* evt){return evt;}
      virtual void statistics(){};
      virtual void setRandomEngine(CLHEP::HepRandomEngine* v)=0;
-
+     virtual void SetLHE(lhef::LHEEvent *l){};
    protected: 
      std::vector<int> fPDGs;
-             
+
    };
 }
 

diff --git a/GeneratorInterface/TauolaInterface/interface/TauolappInterface.h b/GeneratorInterface/TauolaInterface/interface/TauolappInterface.h
@@ -1,55 +1,87 @@
 #ifndef gen_TauolaInterface_TauolappInterface_h
 #define gen_TauolaInterface_TauolappInterface_h
+
 #include "HepPDT/ParticleDataTable.hh"
+
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "GeneratorInterface/TauolaInterface/interface/TauolaInterfaceBase.h"
-namespace HepMC
+#include "TLorentzVector.h"
+#include "TVector.h"
+
+
+namespace HepMC 
 {
-  class GenEvent;
+class GenEvent;
 }
+
 namespace CLHEP
 {
-  class HepRandomEngine;
+class HepRandomEngine;
 }
+
 namespace gen {
   extern "C" {
     void ranmar_( float *rvec, int *lenv );
     void rmarin_( int*, int*, int* );
   }
-  class TauolappInterface : public TauolaInterfaceBase {
-  public:
-    // ctor & dtor
-    TauolappInterface( const edm::ParameterSet& );
-    ~TauolappInterface();
-    void enablePolarization() { fPolarization = true; return; }
-    void disablePolarization() { fPolarization = false; return; }
-    void init( const edm::EventSetup& );
-    const std::vector<int>& operatesOnParticles() { return fPDGs; }
-    HepMC::GenEvent* decay( HepMC::GenEvent* );
-    void statistics() ;
-    void setRandomEngine(CLHEP::HepRandomEngine* v) { fRandomEngine = v; }
-    static double flat();
-  private:
-    // member function(s)
-    void decodeMDTAU( int );
-    void selectDecayByMDTAU();
-    int selectLeptonic();
-    int selectHadronic();
-    //
-    static CLHEP::HepRandomEngine* fRandomEngine;
-    std::vector<int> fPDGs;
-    bool fPolarization;
-    edm::ESHandle<HepPDT::ParticleDataTable> fPDGTable ;
-    edm::ParameterSet* fPSet;
-    bool fIsInitialized;
-    int fMDTAU;
-    bool fSelectDecayByEvent;
-    std::vector<int> fLeptonModes;
-    std::vector<int> fHadronModes;
-    std::vector<double> fScaledLeptonBrRatios;
-    std::vector<double> fScaledHadronBrRatios;
-  };
+
+   class TauolappInterface : public TauolaInterfaceBase {
+      public:
+
+      // ctor & dtor
+     TauolappInterface( const edm::ParameterSet& );
+     ~TauolappInterface();
+
+      void enablePolarization()  { fPolarization = true; return; }
+      void disablePolarization() { fPolarization = false; return; }
+      void init( const edm::EventSetup& );
+      const std::vector<int>& operatesOnParticles() { return fPDGs; }
+      HepMC::GenEvent* decay( HepMC::GenEvent* );
+      void statistics() ;
+      virtual void SetLHE(lhef::LHEEvent *l){lhe=l;}
+      void setRandomEngine(CLHEP::HepRandomEngine* v) { fRandomEngine = v; }
+      static double flat();
+
+      private: 
+      // member function(s)
+      void decodeMDTAU( int );
+      void selectDecayByMDTAU();
+      int selectLeptonic();
+      int selectHadronic();
+
+      HepMC::GenEvent*    make_simple_tau_event(const TLorentzVector &l,int pdgid,int status);
+      void                update_particles(HepMC::GenParticle* partHep,HepMC::GenEvent* theEvent,HepMC::GenParticle* p,TVector3 &boost);
+      bool                isLastTauInChain(const HepMC::GenParticle* tau);
+      HepMC::GenParticle* GetMother(HepMC::GenParticle* tau);
+      double MatchedLHESpinUp(HepMC::GenParticle* tau, std::vector<HepMC::GenParticle> &p, std::vector<double> &spinup,std::vector<int> &m_idx);
+      HepMC::GenParticle* FirstTauInChain(HepMC::GenParticle* tau);
+      void BoostProdToLabLifeTimeInDecays(HepMC::GenParticle* p,TLorentzVector &lab, TLorentzVector &prod);
+
+      //
+      static CLHEP::HepRandomEngine*           fRandomEngine;            
+      std::vector<int>                         fPDGs;
+      bool                                     fPolarization;      
+      edm::ESHandle<HepPDT::ParticleDataTable> fPDGTable ;
+      edm::ParameterSet*                       fPSet;
+      bool                                     fIsInitialized;
+
+      int                                      fMDTAU;
+      bool                                     fSelectDecayByEvent;
+      std::vector<int>                         fLeptonModes;
+      std::vector<int>                         fHadronModes;
+      std::vector<double>                      fScaledLeptonBrRatios;
+      std::vector<double>                      fScaledHadronBrRatios;
+      lhef::LHEEvent *lhe;
+
+      double dmMatch;
+      bool   dolhe;
+      bool   dolheBosonCorr;
+      int    ntries;
+      double lifetime;
+   };
+
 }
+
 #endif
diff --git a/GeneratorInterface/TauolaInterface/plugins/BuildFile.xml b/GeneratorInterface/TauolaInterface/plugins/BuildFile.xml
@@ -8,6 +8,8 @@
   <use name="heppdt"/>
   <use name="clhep"/>
   <use name="hepmc"/>
+  <use name="root"/>
+  <use name="rootmath"/>
   <use name="tauolapp"/>
   <flags EDM_PLUGIN="1"/>
 </library>