Changeset 91ef0b8 in git for classes/DelphesClasses.cc

Timestamp:

Mar 7, 2021, 9:48:26 AM (4 years ago)

Author:

Franco BEDESCHI <bed@…>

Branches:

master

Children:

bd33fce

Parents:

0d65492 (diff), 363e269 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fixed conflicts and Reginv3

File:

• classes/DelphesClasses.cc (modified) (3 diffs)

classes/DelphesClasses.cc

@@ -112 +112 @@
   TMatrixDSym Cv;
   Cv.ResizeTo(5, 5);
-  
+
   // convert diagonal term to original units
-  Cv(0, 0)=TMath::Power(ErrorD0*1.0E-3, 2.);
+  Cv(0, 0)=TMath::Power(ErrorD0, 2.);
   Cv(1, 1)=TMath::Power(ErrorPhi, 2.);
-  Cv(2, 2)=TMath::Power(ErrorC*1.0E3, 2.);
-  Cv(3, 3)=TMath::Power(ErrorDZ*1.0E-3, 2.);
+  Cv(2, 2)=TMath::Power(ErrorC, 2.);
+  Cv(3, 3)=TMath::Power(ErrorDZ, 2.);
   Cv(4, 4)=TMath::Power(ErrorCtgTheta, 2.);
 
@@ -171 +171 @@
   TMatrixDSym Cv;
   Cv.ResizeTo(5, 5);
-  
+
   // convert diagonal term to original units
-  Cv(0, 0)=TMath::Power(ErrorD0*1.0E-3, 2.);
+  Cv(0, 0)=TMath::Power(ErrorD0, 2.);
   Cv(1, 1)=TMath::Power(ErrorPhi, 2.);
-  Cv(2, 2)=TMath::Power(ErrorC*1.0E3, 2.);
-  Cv(3, 3)=TMath::Power(ErrorDZ*1.0E-3, 2.);
+  Cv(2, 2)=TMath::Power(ErrorC, 2.);
+  Cv(3, 3)=TMath::Power(ErrorDZ, 2.);
   Cv(4, 4)=TMath::Power(ErrorCtgTheta, 2.);
 
@@ -234 +234 @@
   NNeutrals(0),
   NeutralEnergyFraction(0),  // charged energy fraction
-  ChargedEnergyFraction(0),  // neutral energy fraction 
+  ChargedEnergyFraction(0),  // neutral energy fraction
   Beta(0),
   BetaStar(0),