improvements in consistent fucntions. Add pdl file needed for D4piTest example.

Author: Jojosito

evt.pdl

@@ -59,6 +59,10 @@ class Particle : public AmplitudeComponent
     double mass() const
     { return Mass_; }
 
+    /// Get name
+    std::string name() const
+    { return Name_; }
+
     /// @}
 
     /// \name Setters

include/Particle.h

@@ -20,8 +20,6 @@ int main( int argc, char** argv)
   double radialSize = 1.;
   yap::InitialStateParticle* D = factory.createInitialStateParticle(421, radialSize);
 
-  // a_1 channels
-  yap::Resonance* sigma = factory.createResonanceBreitWigner(9000221, radialSize);
 
   // rho rho
   yap::Resonance* rho = factory.createResonanceBreitWigner(113, radialSize);
@@ -45,6 +43,18 @@ int main( int argc, char** argv)
   factory.createChannel(D, rho, omega, 2);
 
 
+  // a_1 channels
+  yap::Resonance* sigma = factory.createResonanceBreitWigner(9000221, radialSize);
+  factory.createChannel(sigma, piPlus, piMinus, 0);
+
+  yap::Resonance* a_1 = factory.createResonanceBreitWigner(20213, radialSize);
+  factory.createChannel(a_1, sigma, piPlus, 1);
+
+  factory.createChannel(a_1, rho, piPlus, 0);
+  factory.createChannel(a_1, rho, piPlus, 2);
+
+  factory.createChannel(D, a_1, piMinus, 1);
+
 
 
 

programs/D4piTest.cxx

@@ -18,6 +18,7 @@ Amp BlattWeisskopf::amplitude(DataPoint& d)
 //-------------------------
 bool BlattWeisskopf::consistent() const
 {
+    /// \todo implement
     return true;
 }
 

src/BlattWeisskopf.cxx

@@ -1,6 +1,7 @@
 #include "BreitWigner.h"
 
 #include "Constants.h"
+#include "logging.h"
 
 namespace yap {
 
@@ -27,7 +28,17 @@ Amp BreitWigner::amplitude(double s)
 //-------------------------
 bool BreitWigner::consistent() const
 {
-    return (mass() > 0 && width() > 0);
+    bool consistent = true;
+    if (mass() <= 0) {
+        LOG(ERROR) << "BreitWigner::consistent() - mass <= 0";
+        consistent = false;
+    }
+    if (width() <= 0) {
+        LOG(ERROR) << "BreitWigner::consistent() - width <= 0";
+        consistent = false;
+    }
+
+    return consistent;
 }
 
 }

src/BreitWigner.cxx

@@ -27,13 +27,16 @@ bool DecayChannel::consistent() const
     // check daughters
     for (Daughters::const_iterator d = Daughters_.begin(); d != Daughters_.end(); ++d)
         consistent &= (*d)->consistent();
+    if (! consistent) {
+        LOG(ERROR) << "DecayChannel::consistent() - daughter inconsistent";
+    }
 
     consistent &= BlattWeisskopf_.consistent();
     consistent &= SpinAmplitude_.consistent();
 
     // check size of spin amplitude quantum numbers and size of daughters
     if (SpinAmplitude_.finalQuantumNumbers().size() != Daughters_.size()) {
-        LOG(ERROR) << "DecayChannel::consistent() - quantum mbumbers object and daughters object size mismatch";
+        LOG(ERROR) << "DecayChannel::consistent() - quantum numbers object and daughters object size mismatch";
         consistent = false;
     }
 
@@ -101,6 +104,9 @@ bool DecayChannel::consistent() const
         consistent =  false;
     }
 
+    if (! consistent) {
+        LOG(ERROR) << "Channel is not consistent:  " << this->parent()->name() << " - > " << this->daughters()[0]->name() << " + " << this->daughters()[1]->name() << "\n";
+    }
     return consistent;
 }
 

src/DecayChannel.cxx

@@ -25,6 +25,10 @@ bool Resonance::consistent() const
     consistent &= DecayingParticle::consistent();
     consistent &= massShape()->consistent();
 
+    if (! consistent) {
+        LOG(ERROR) << "Resonance is not consistent:  " << this->name() << "\n";
+    }
+
     return consistent;
 }