merging changes from 1.9

ChangeLog

+2005-11-04  Lynn Garren <garren@fnal.gov>
+
+	* HepPDT/addEvtGenParticles.cc: Bug fix
+
+2005-11-03  Lynn Garren <garren@fnal.gov>
+
+	* Vector/configure.in, LorentzVector.icc
+	Provide a flag to enable code differences when compiling with 
+	Visual C++.
+
+2005-10-20  Lynn Garren <garren@fnal.gov>
+
+	* HepPDT/CommonParticleData.icc: Bug fix - low and high cutoffs for the width
+	were not being saved.
+	* Also write out cutoffs.
+
 2005-07-27  Lynn Garren <garren@fnal.gov>
 
 	* HepPDT/convertTemporaryMap.icc: Fill DecayData properly.

HepPDT/ChangeLog

+2005-11-04  Lynn Garren <garren@fnal.gov>
+
+	* addEvtGenParticles.cc: Bug fix
+
+2005-10-20  Lynn Garren <garren@fnal.gov>
+
+	* CommonParticleData.icc: Bug fix - low and high cutoffs for the width
+	were not being saved.
+	* Also write out cutoffs.
+
 2005-07-27  Lynn Garren <garren@fnal.gov>
 
 	* convertTemporaryMap.icc: Fill DecayData properly.

HepPDT/HepPDT/CommonParticleData.hh

@@ -48,6 +48,8 @@ public:
   SpinState                   spin()        const { return itsSpin; }
   Measurement                 mass()        const { return itsResonance->mass(); }
   Measurement                 totalWidth()  const { return itsResonance->totalWidth(); }
+  double                      lowerCutoff() const { return itsResonance->lowerCutoff(); }
+  double                      upperCutoff() const { return itsResonance->upperCutoff(); }
   inline Measurement          lifetime()    const;
   int                         numConstituents() const { return itsQuarks.size(); }
   inline Constituent          constituent( unsigned int i ) const;

HepPDT/HepPDT/CommonParticleData.icc

@@ -19,7 +19,7 @@ CommonParticleData::CommonParticleData( const TempParticleData & tpd )
   itsResonance     ( NULL )
 {
     ResonanceStructure * rs = 
-           new ResonanceStructure( tpd.tempMass, tpd.tempWidth, 0., 0. );
+           new ResonanceStructure( tpd.tempMass, tpd.tempWidth, tpd.tempLowCutoff, tpd.tempHighCutoff );
     itsResonance = rs;
     getConstituentsFromPID();
 }

HepPDT/HepPDT/ParticleDataTableT.icc

@@ -108,7 +108,8 @@ void ParticleDataTableT<Config>::writeParticleData( std::ostream & outstr )
          << " SPIN: J  S   L"
 	 << "  MASS"
 	 << "                       WIDTH"
-	 << "                    LIFETIME"
+	 << "                    LOW CUT    HIGH CUT"
+	 << "      LIFETIME"
          << std::endl;  
   // write particle info
   const_iterator cit;
@@ -134,7 +135,8 @@ void ParticleDataTableT<Config>::writeParticleInfo( std::ostream & outstr )
          << " SPIN: J  S   L"
 	 << "  MASS"
 	 << "                       WIDTH"
-	 << "                    LIFETIME"
+	 << "                    LOW CUT    HIGH CUT"
+	 << "      LIFETIME"
          << std::endl;  
   // write particle info
   const_iterator cit;

HepPDT/examples/examMyPDT.out.save

 
 HepPDT-ParticleDataTable-begin
              *****  ParticleDataTable  *****
-             HepPDT Version: 1.02.00
+             HepPDT Version: 1.02.01
              Table Name :  
                   ( 5 entries )
-PARTICLE NAME                 ID  CHARGE COLOR SPIN: J  S   L  MASS                       WIDTH                    LIFETIME
-W-                           -24      -1     0    1    0    0  8.03960e+01+/-0.00000e+00  2.0600e+00+/-0.0000e+00  3.1952e-25+/-0.0000e+00
-u~                            -2 -0.3333     0  0.5    0    0  0.00000e+00+/-0.00000e+00 -1.0000e+00+/-0.0000e+00  0.0000e+00+/-0.0000e+00
-d                              1 -0.6667     0  0.5    0    0  0.00000e+00+/-0.00000e+00 -1.0000e+00+/-0.0000e+00  0.0000e+00+/-0.0000e+00
-gamma                         22       0     0    1    0    0  0.00000e+00+/-0.00000e+00 -1.0000e+00+/-0.0000e+00  0.0000e+00+/-0.0000e+00
-p+                          2212       1     0  0.5    0    0  9.38000e-01+/-0.00000e+00 -1.0000e+00+/-0.0000e+00  0.0000e+00+/-0.0000e+00
+PARTICLE NAME                 ID  CHARGE COLOR SPIN: J  S   L  MASS                       WIDTH                    LOW CUT    HIGH CUT      LIFETIME
+W-                           -24      -1     0    1    0    0  8.03960e+01+/-0.00000e+00  2.0600e+00+/-0.0000e+00  0.0000e+00 0.0000e+00    3.1952e-25+/-0.0000e+00
+u~                            -2 -0.3333     0  0.5    0    0  0.00000e+00+/-0.00000e+00 -1.0000e+00+/-0.0000e+00  0.0000e+00 0.0000e+00    0.0000e+00+/-0.0000e+00
+d                              1 -0.6667     0  0.5    0    0  0.00000e+00+/-0.00000e+00 -1.0000e+00+/-0.0000e+00  0.0000e+00 0.0000e+00    0.0000e+00+/-0.0000e+00
+gamma                         22       0     0    1    0    0  0.00000e+00+/-0.00000e+00 -1.0000e+00+/-0.0000e+00  0.0000e+00 0.0000e+00    0.0000e+00+/-0.0000e+00
+p+                          2212       1     0  0.5    0    0  9.38000e-01+/-0.00000e+00 -1.0000e+00+/-0.0000e+00  0.0000e+00 0.0000e+00    0.0000e+00+/-0.0000e+00
 HepPDT-ParticleDataTable-end

HepPDT/src/addEvtGenParticles.cc

@@ -42,7 +42,7 @@ bool getEvtGenLineType( std::string & ltype, int & id, std::string & name, const
     if( firstc == "*" || firstc == "#" ) { return false; }
     // a # may be anywhere on the line
     // check for empty lines
-    if( sl > 10 ){
+    if( sl > 5 ){
 	std::istringstream thisline( pdline.substr(0,sl).c_str() );
 	thisline >> ltype;
 	if( ltype == "add" ) {

HepPDT/src/version.cc

@@ -13,7 +13,7 @@ namespace HepPDT {
 
 std::string versionName( )
 {
-    return "1.02.00";
+    return "1.02.01";
 }
 
 void version( )

HepPDT/src/write.cc

@@ -54,6 +54,9 @@ void CommonParticleData::write( std::ostream & ostr ) const
     ostr << width.value() << "+/-" << width.sigma() ;
     ostr.width(12);
     ostr.precision(4);
+    ostr << lowerCutoff() << " " << upperCutoff();
+    ostr.width(14);
+    ostr.precision(4);
     ostr << ctau.value() << "+/-" << ctau.sigma();
     // return to default settings
     ostr.precision(6);