D39.1759146679.diff
No OneTemporary
Actions

Size

21 KB

Referenced Files

None

Subscribers

None

D39.1759146679.diff
View Options

	diff --git a/inc/LauKMatrixProdPole.hh b/inc/LauKMatrixProdPole.hh
	--- a/inc/LauKMatrixProdPole.hh
	+++ b/inc/LauKMatrixProdPole.hh
	@@ -44,7 +44,7 @@

	class LauKMatrixProdPole : public LauAbsResonance {

	- public:
	+ public:
	//! Constructor
	/*!
	\param [in] poleName name of the pole
	@@ -54,34 +54,36 @@
	\param [in] daughters the daughter particles
	\param [in] useProdAdler boolean to turn on/off the production Adler zero factor
	*/
	- LauKMatrixProdPole(const TString& poleName, Int_t poleIndex, Int_t resPairAmpInt,
	- LauKMatrixPropagator* propagator, const LauDaughters* daughters,
	- Bool_t useProdAdler = kFALSE);
	+ LauKMatrixProdPole( const TString& poleName, Int_t poleIndex, Int_t resPairAmpInt,
	+ LauKMatrixPropagator* propagator, const LauDaughters* daughters,
	+ Bool_t useProdAdler = kFALSE);

	//! Destructor
	- virtual ~LauKMatrixProdPole();
	+ virtual ~LauKMatrixProdPole();

	// Initialise the model
	- virtual void initialise() {return;}
	+ virtual void initialise() {return;}

	//! The amplitude calculation
	/*!
	\param [in] kinematics the kinematic variables of the current event
	\return the complex amplitude
	*/
	- virtual LauComplex amplitude(const LauKinematics* kinematics);
	+ virtual LauComplex amplitude(const LauKinematics* kinematics);

	//! Get the resonance model type
	- /*!
	- \return the resonance model type
	- */
	+ /*!
	+ \return the resonance model type
	+ */
	virtual LauAbsResonance::LauResonanceModel getResonanceModel() const {return LauAbsResonance::KMatrix;}

	+ virtual const std::vector<LauParameter*>& getFloatingParameters();
	+
	protected:
	//! Function not meant to be called, amplitude is called directly in this case
	- virtual LauComplex resAmp(Double_t mass, Double_t spinTerm);
	+ virtual LauComplex resAmp(Double_t mass, Double_t spinTerm);

	- private:
	+ private:
	//! Copy constructor (not implemented)
	LauKMatrixProdPole(const LauKMatrixProdPole& rhs);

	@@ -89,14 +91,14 @@
	LauKMatrixProdPole& operator=(const LauKMatrixProdPole& rhs);

	//! The K-matrix propagator
	- LauKMatrixPropagator* thePropagator_;
	+ LauKMatrixPropagator* thePropagator_;
	//! The number of the pole
	Int_t poleIndex_;

	- //! Boolean to turn on/off the production Adler zero factor
	- Bool_t useProdAdler_;
	+ //! Boolean to turn on/off the production Adler zero factor
	+ Bool_t useProdAdler_;

	- ClassDef(LauKMatrixProdPole, 0) // K-matrix production pole
	+ ClassDef(LauKMatrixProdPole, 0) // K-matrix production pole

	};

	diff --git a/inc/LauKMatrixProdSVP.hh b/inc/LauKMatrixProdSVP.hh
	--- a/inc/LauKMatrixProdSVP.hh
	+++ b/inc/LauKMatrixProdSVP.hh
	@@ -76,6 +76,8 @@
	\return the resonance model type
	*/
	virtual LauAbsResonance::LauResonanceModel getResonanceModel() const {return LauAbsResonance::KMatrix;}
	+
	+ const std::vector<LauParameter*>& getFloatingParameters();

	protected:
	//! Function not meant to be called
	diff --git a/inc/LauKMatrixPropagator.hh b/inc/LauKMatrixPropagator.hh
	--- a/inc/LauKMatrixPropagator.hh
	+++ b/inc/LauKMatrixPropagator.hh
	@@ -49,7 +49,7 @@

	class LauKMatrixPropagator {

	- public:
	+ public:
	//! Constructor
	/*!
	\param [in] name name of the propagator
	@@ -59,12 +59,12 @@
	\param [in] nPoles the number of poles
	\param [in] rowIndex this specifies which row of the propagator should be used when summing over the amplitude channels
	*/
	- LauKMatrixPropagator(const TString& name, const TString& paramFileName,
	- Int_t resPairAmpInt, Int_t nChannels, Int_t nPoles,
	- Int_t rowIndex = 1);
	+ LauKMatrixPropagator( const TString& name, const TString& paramFileName,
	+ Int_t resPairAmpInt, Int_t nChannels, Int_t nPoles,
	+ Int_t rowIndex = 1 );

	//! Destructor
	- virtual ~LauKMatrixPropagator();
	+ virtual ~LauKMatrixPropagator();

	//! Calculate the invariant mass squared s
	/*!
	@@ -82,25 +82,25 @@
	/*!
	\param [in] inputFile name of the input file
	*/
	- void setParameters(const TString& inputFile);
	+ void setParameters(const TString& inputFile);

	- //! Get the scattering K matrix
	- /*!
	- \return the real, symmetric scattering K matrix
	+ //! Get the scattering K matrix
	+ /*!
	+ \return the real, symmetric scattering K matrix
	*/
	- TMatrixD getKMatrix() const {return ScattKMatrix_;}
	+ TMatrixD getKMatrix() const {return ScattKMatrix_;}

	- //! Get the real part of the propagator full matrix
	- /*!
	- \return the real part of the propagator full matrix
	- */
	- TMatrixD getRealPropMatrix() const {return realProp_;}
	+ //! Get the real part of the propagator full matrix
	+ /*!
	+ \return the real part of the propagator full matrix
	+ */
	+ TMatrixD getRealPropMatrix() const {return realProp_;}

	- //! Get the negative imaginary part of the full propagator matrix
	- /*!
	- \return the negative imaginary part of the full propagator matrix
	- */
	- TMatrixD getNegImagPropMatrix() const {return negImagProp_;}
	+ //! Get the negative imaginary part of the full propagator matrix
	+ /*!
	+ \return the negative imaginary part of the full propagator matrix
	+ */
	+ TMatrixD getNegImagPropMatrix() const {return negImagProp_;}

	//! Get the real part of the term of the propagator
	/*!
	@@ -123,6 +123,14 @@
	*/
	Double_t getPoleDenomTerm(Int_t poleIndex) const;

	+ //! Get coupling parameters, set according to the input file
	+ /*!
	+ \param [in] poleIndex number of the required pole
	+ \param [in] channelIndex number of the required channel
	+ \return the parameter of the coupling constant
	+ */
	+ LauParameter& getPoleMassSqParameter(Int_t poleIndex);
	+
	//! Get coupling constants that were loaded from the input file
	/*!
	\param [in] poleIndex number of the required pole
	@@ -131,6 +139,14 @@
	*/
	Double_t getCouplingConstant(Int_t poleIndex, Int_t channelIndex) const;

	+ //! Get coupling parameters, set according to the input file
	+ /*!
	+ \param [in] poleIndex number of the required pole
	+ \param [in] channelIndex number of the required channel
	+ \return the parameter of the coupling constant
	+ */
	+ LauParameter& getCouplingParameter(Int_t poleIndex, Int_t channelIndex);
	+
	//! Get scattering constants that were loaded from the input file
	/*!
	\param [in] channel1Index number of the first channel index
	@@ -143,6 +159,25 @@
	/*!
	\return the svp term
	*/
	+
	+ //! Get scattering parameters, set according to the input file
	+ /*!
	+ \param [in] channel1Index number of the first channel index
	+ \param [in] channel2Index number of the second channel index
	+ \return the parameter of the scattering constant
	+ */
	+ LauParameter& getScatteringParameter(Int_t channel1Index, Int_t channel2Index);
	+
	+ //! Get s0 production parameter
	+ /*!
	+ \return the s0Prod parameter
	+ */
	+ LauParameter& gets0Prod() {return s0Prod_;}
	+
	+ //! Get production SVP term
	+ /*!
	+ \return the prodSVP_ value
	+ */
	Double_t getProdSVPTerm() const {return prodSVP_;}

	//! Get the full complex propagator term for a given channel
	@@ -154,62 +189,60 @@

	//! Get the DP axis identifier
	/*!
	- /return the value to identify the DP axis in question
	+ \return the value to identify the DP axis in question
	*/
	Int_t getResPairAmpInt() const {return resPairAmpInt_;}

	//! Get the number of channels
	/*!
	- /return the number of channels
	+ \return the number of channels
	*/
	Int_t getNChannels() const {return nChannels_;}

	//! Get the number of poles
	/*!
	- /return the number of poles
	+ \return the number of poles
	*/
	Int_t getNPoles() const {return nPoles_;}

	//! Get the propagator name
	/*!
	- /return the name of the propagator
	+ \return the name of the propagator
	*/
	TString getName() const {return name_;}

	- //! Get the unitary transition amplitude for the given channel
	- /*!
	- \param [in] s The invariant mass squared
	- \param [in] channel The index number of the channel process
	- \return the complex amplitude T
	+ //! Get the unitary transition amplitude for the given channel
	+ /*!
	+ \param [in] s The invariant mass squared
	+ \param [in] channel The index number of the channel process
	+ \return the complex amplitude T
	*/
	- LauComplex getTransitionAmp(Double_t s, Int_t channel);
	-
	+ LauComplex getTransitionAmp(Double_t s, Int_t channel);

	- //! Get the complex phase space term for the given channel and invariant mass squared
	- /*!
	- \param [in] s The invariant mass squared
	- \param [in] channel The index number of the channel process
	- \return the complex phase space term rho(channel, channel)
	+ //! Get the complex phase space term for the given channel and invariant mass squared
	+ /*!
	+ \param [in] s The invariant mass squared
	+ \param [in] channel The index number of the channel process
	+ \return the complex phase space term rho(channel, channel)
	*/
	- LauComplex getPhaseSpaceTerm(Double_t s, Int_t channel);
	+ LauComplex getPhaseSpaceTerm(Double_t s, Int_t channel);

	- //! Get the Adler zero factor, which is set when updatePropagator is called
	- /*!
	- \return the Adler zero factor
	+ //! Get the Adler zero factor, which is set when updatePropagator is called
	+ /*!
	+ \return the Adler zero factor
	*/
	- Double_t getAdlerZero() const {return adlerZeroFactor_;}
	+ Double_t getAdlerZero() const {return adlerZeroFactor_;}


	- //! Get the THat amplitude for the given s and channel number
	- /*!
	- \param [in] s The invariant mass squared
	+ //! Get the THat amplitude for the given s and channel number
	+ /*!
	+ \param [in] s The invariant mass squared
	\param [in] channel The index number of the channel process
	\return the complex THat amplitude
	*/
	- LauComplex getTHat(Double_t s, Int_t channel);
	-
	+ LauComplex getTHat(Double_t s, Int_t channel);

	- protected:
	+ protected:
	//! Calculate the scattering K-matrix for the given value of s
	/*!
	\param [in] s the invariant mass squared
	@@ -318,22 +351,22 @@
	Bool_t checkPhaseSpaceType(Int_t phaseSpaceInt) const;


	- //! Get the unitary transition amplitude matrix for the given kinematics
	- /*!
	- \param [in] kinematics The pointer to the constant kinematics
	+ //! Get the unitary transition amplitude matrix for the given kinematics
	+ /*!
	+ \param [in] kinematics The pointer to the constant kinematics
	*/
	- void getTMatrix(const LauKinematics* kinematics);
	+ void getTMatrix(const LauKinematics* kinematics);

	- //! Get the unitary transition amplitude matrix for the given kinematics
	- /*!
	- \param [in] s The invariant mass squared of the system
	+ //! Get the unitary transition amplitude matrix for the given kinematics
	+ /*!
	+ \param [in] s The invariant mass squared of the system
	*/
	- void getTMatrix(Double_t s);
	+ void getTMatrix(Double_t s);

	- //! Get the square root of the phase space matrix
	- void getSqrtRhoMatrix();
	-
	- private:
	+ //! Get the square root of the phase space matrix
	+ void getSqrtRhoMatrix();
	+
	+ private:
	//! Copy constructor (not implemented)
	LauKMatrixPropagator(const LauKMatrixPropagator& rhs);

	@@ -341,39 +374,39 @@
	LauKMatrixPropagator& operator=(const LauKMatrixPropagator& rhs);

	//! Create a map for the K-matrix parameters
	- typedef std::map<int, std::vector<LauParameter> > KMatrixParamMap;
	+ typedef std::map<int, std::vector<LauParameter> > KMatrixParamMap;


	- //! Initialise and set the dimensions for the internal matrices and parameter arrays
	- void initialiseMatrices();
	+ //! Initialise and set the dimensions for the internal matrices and parameter arrays
	+ void initialiseMatrices();

	- //! Store the (phase space) channel indices from a line in the parameter file
	- /*!
	- \param [in] theLine Vector of strings corresponding to the line from the parameter file
	+ //! Store the (phase space) channel indices from a line in the parameter file
	+ /*!
	+ \param [in] theLine Vector of strings corresponding to the line from the parameter file
	*/
	- void storeChannels(const std::vector<std::string>& theLine);
	+ void storeChannels(const std::vector<std::string>& theLine);

	- //! Store the pole mass and couplings from a line in the parameter file
	- /*!
	- \param [in] theLine Vector of strings corresponding to the line from the parameter file
	+ //! Store the pole mass and couplings from a line in the parameter file
	+ /*!
	+ \param [in] theLine Vector of strings corresponding to the line from the parameter file
	*/
	- void storePole(const std::vector<std::string>& theLine);
	+ void storePole(const std::vector<std::string>& theLine);

	- //! Store the scattering coefficients from a line in the parameter file
	- /*!
	- \param [in] theLine Vector of strings corresponding to the line from the parameter file
	+ //! Store the scattering coefficients from a line in the parameter file
	+ /*!
	+ \param [in] theLine Vector of strings corresponding to the line from the parameter file
	*/
	- void storeScattering(const std::vector<std::string>& theLine);
	+ void storeScattering(const std::vector<std::string>& theLine);

	- //! Store miscelleanous parameters from a line in the parameter file
	- /*!
	- \param [in] keyword the name of the parameter to be set
	- \param [in] parString the string containing the value of the parameter
	+ //! Store miscelleanous parameters from a line in the parameter file
	+ /*!
	+ \param [in] keyword the name of the parameter to be set
	+ \param [in] parString the string containing the value of the parameter
	*/
	- void storeParameter(const TString& keyword, const TString& parString);
	+ void storeParameter(const TString& keyword, const TString& parString);


	- //! String to store the propagator name
	+ //! String to store the propagator name
	TString name_;
	//! Name of the input parameter file
	TString paramFileName_;
	@@ -415,10 +448,10 @@
	TMatrixD ReSqrtRhoMatrix_;
	//! Imaginary part of the square root of the phase space density diagonal matrix
	TMatrixD ImSqrtRhoMatrix_;
	- //! Real part of the unitary T matrix
	- TMatrixD ReTMatrix_;
	- //! Imaginary part of the unitary T matrix
	- TMatrixD ImTMatrix_;
	+ //! Real part of the unitary T matrix
	+ TMatrixD ReTMatrix_;
	+ //! Imaginary part of the unitary T matrix
	+ TMatrixD ImTMatrix_;

	//! Number of channels
	Int_t nChannels_;
	@@ -426,12 +459,12 @@
	Int_t nPoles_;

	//! Vector of squared pole masses
	- std::vector<LauParameter> mSqPoles_;
	+ std::vector<LauParameter> mSqPoles_;

	//! Array of coupling constants
	- LauParArray gCouplings_;
	+ LauParArray gCouplings_;
	//! Array of scattering SVP values
	- LauParArray fScattering_;
	+ LauParArray fScattering_;

	//! Vector of phase space types
	std::vector<Int_t> phaseSpaceTypes_;
	@@ -490,8 +523,8 @@
	//! Control the output of the functions
	Bool_t verbose_;

	- //! Control if scattering constants are channel symmetric: f_ji = f_ij
	- Bool_t scattSymmetry_;
	+ //! Control if scattering constants are channel symmetric: f_ji = f_ij
	+ Bool_t scattSymmetry_;

	ClassDef(LauKMatrixPropagator,0) // K-matrix amplitude model
	};
	diff --git a/src/LauKMatrixProdPole.cc b/src/LauKMatrixProdPole.cc
	--- a/src/LauKMatrixProdPole.cc
	+++ b/src/LauKMatrixProdPole.cc
	@@ -106,3 +106,32 @@
	return amp;

	}
	+
	+const std::vector<LauParameter*>& LauKMatrixProdPole::getFloatingParameters()
	+{
	+
	+ this->clearFloatingParameters();
	+
	+ Int_t nChannels = thePropagator_->getNChannels();
	+
	+ for (int jChannel = 0 ; jChannel < nChannels ; jChannel++)
	+ {
	+ LauParameter& par_gj_ = thePropagator_->getCouplingParameter(poleIndex_, jChannel);
	+ if ( !par_gj_.fixed() )
	+ {
	+ this->addFloatingParameter( &par_gj_ );
	+ }
	+ }
	+
	+ for (int iPole = 0 ; iPole < thePropagator_->getNPoles() ; iPole++)
	+ {
	+ LauParameter& par_polemasssq_ = thePropagator_->getPoleMassSqParameter(poleIndex_);
	+ if ( !par_polemasssq_.fixed() )
	+ {
	+ this->addFloatingParameter( &par_polemasssq_ );
	+ }
	+ }
	+
	+ return this->getParameters();
	+
	+}
	\ No newline at end of file
	diff --git a/src/LauKMatrixProdSVP.cc b/src/LauKMatrixProdSVP.cc
	--- a/src/LauKMatrixProdSVP.cc
	+++ b/src/LauKMatrixProdSVP.cc
	@@ -94,3 +94,26 @@

	}

	+const std::vector<LauParameter*>& LauKMatrixProdSVP::getFloatingParameters()
	+{
	+
	+ this->clearFloatingParameters();
	+
	+ Int_t nChannels = thePropagator_->getNChannels();
	+
	+ for (int jChannel = 0 ; jChannel < nChannels ; jChannel++)
	+ {
	+ LauParameter& par_f_ = thePropagator_->getScatteringParameter(channelIndex_, jChannel);
	+ if ( !par_f_.fixed() )
	+ this->addFloatingParameter( &par_f_ );
	+ }
	+
	+ LauParameter& par_s0Prod_ = thePropagator_->gets0Prod();
	+ if ( !par_s0Prod_.fixed() )
	+ {
	+ this->addFloatingParameter( &par_s0Prod_ );
	+ }
	+
	+ return this->getParameters();
	+
	+}
	\ No newline at end of file
	diff --git a/src/LauKMatrixPropagator.cc b/src/LauKMatrixPropagator.cc
	--- a/src/LauKMatrixPropagator.cc
	+++ b/src/LauKMatrixPropagator.cc
	@@ -45,7 +45,7 @@
	ClassImp(LauKMatrixPropagator)

	LauKMatrixPropagator::LauKMatrixPropagator(const TString& name, const TString& paramFile,
	- Int_t resPairAmpInt, Int_t nChannels,
	+ Int_t resPairAmpInt, Int_t nChannels,
	Int_t nPoles, Int_t rowIndex) :
	name_(name),
	paramFileName_(paramFile),
	@@ -452,7 +452,7 @@

	Double_t poleMass = std::atof(theLine[2].c_str());
	Double_t poleMassSq = poleMass*poleMass;
	- LauParameter mPoleParam(poleMassSq);
	+ LauParameter mPoleParam(Form("KM_poleMassSq_%i",poleIndex),poleMassSq);
	mSqPoles_[poleIndex] = mPoleParam;

	cout<<"Added bare pole mass "<<poleMass<<" GeV for pole number "<<poleIndex+1<<endl;
	@@ -460,7 +460,7 @@
	for (Int_t iChannel = 0; iChannel < nChannels_; iChannel++) {

	Double_t couplingConst = std::atof(theLine[iChannel+3].c_str());
	- LauParameter couplingParam(couplingConst);
	+ LauParameter couplingParam(Form("KM_gCoupling_%i_%i",poleIndex,iChannel),couplingConst);
	gCouplings_[poleIndex][iChannel] = couplingParam;

	cout<<"Added coupling parameter g^{"<<poleIndex+1<<"}_"
	@@ -473,8 +473,8 @@
	} else {

	cerr<<"Error in LauKMatrixPropagator::storePole. Expecting "<<nExpect
	- <<" numbers for pole definition but found "<<nWords
	- <<" values instead"<<endl;
	+ <<" numbers for pole definition but found "<<nWords
	+ <<" values instead"<<endl;

	}

	@@ -539,7 +539,7 @@

	Double_t s0ProdValue = std::atof(parString.Data());
	cout<<"Adler zero constant s0Prod = "<<s0ProdValue<<endl;
	- s0Prod_ = LauParameter("s0Scatt", s0ProdValue);
	+ s0Prod_ = LauParameter("s0Prod", s0ProdValue);

	} else if (!keyword.CompareTo("sa0")) {

	@@ -651,6 +651,16 @@

	}

	+LauParameter& LauKMatrixPropagator::getPoleMassSqParameter(Int_t poleIndex)
	+{
	+ if ( (parametersSet_ == kFALSE) \|\| (poleIndex < 0 \|\| poleIndex >= nPoles_) ) {
	+ std::cerr << "ERROR from LauKMatrixPropagator::getPoleMassSqParameter(). Invalid pole." << std::endl;
	+ gSystem->Exit(EXIT_FAILURE);
	+ }
	+
	+ return mSqPoles_[poleIndex];
	+}
	+
	Double_t LauKMatrixPropagator::getCouplingConstant(Int_t poleIndex, Int_t channelIndex) const
	{

	@@ -663,6 +673,18 @@

	}

	+LauParameter& LauKMatrixPropagator::getCouplingParameter(Int_t poleIndex, Int_t channelIndex)
	+{
	+
	+ if ( (parametersSet_ == kFALSE) \|\| (poleIndex < 0 \|\| poleIndex >= nPoles_) \|\| (channelIndex < 0 \|\| channelIndex >= nChannels_) ) {
	+ std::cerr << "ERROR from LauKMatrixPropagator::getCouplingParameter(). Invalid coupling." << std::endl;
	+ gSystem->Exit(EXIT_FAILURE);
	+ }
	+
	+ //std::cout << "Minvalue + range for " << poleIndex << ", " << channelIndex << ": " << gCouplings_[poleIndex][channelIndex].minValue() << " => + " << gCouplings_[poleIndex][channelIndex].range() <<
	+ // " and init value: " << gCouplings_[poleIndex][channelIndex].initValue() << std::endl;
	+ return gCouplings_[poleIndex][channelIndex];
	+}

	Double_t LauKMatrixPropagator::getScatteringConstant(Int_t channel1Index, Int_t channel2Index) const
	{
	@@ -676,6 +698,17 @@

	}

	+LauParameter& LauKMatrixPropagator::getScatteringParameter(Int_t channel1Index, Int_t channel2Index)
	+{
	+
	+ if ( (parametersSet_ == kFALSE) \|\| (channel1Index < 0 \|\| channel1Index >= nChannels_) \|\| (channel2Index < 0 \|\| channel2Index >= nChannels_) ) {
	+ std::cerr << "ERROR from LauKMatrixPropagator::getScatteringParameter(). Invalid chanel index." << std::endl;
	+ gSystem->Exit(EXIT_FAILURE);
	+ }
	+
	+ return fScattering_[channel1Index][channel2Index];
	+}
	+
	Double_t LauKMatrixPropagator::calcSVPTerm(Double_t s, Double_t s0) const
	{

File Metadata

Mime Type: text/plain
Expires: Mon, Sep 29, 12:51 PM (16 h, 7 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 6568852
Default Alt Text: D39.1759146679.diff (21 KB)

D39.1759146679.diffNo OneTemporaryActions

D39.1759146679.diffView Options

File Metadata

Event Timeline

D39.1759146679.diff
No OneTemporary
Actions

D39.1759146679.diff
View Options