Merge branch 'master' into hotfix-stable

Author: vsht

.gitignore

@@ -1,6 +1,6 @@
 FeynCalc/FeynArts
 FeynCalc/FeynArts/*
-FeynCalc/Database/*.db
+FeynCalc/Database/*
 FeynCalc/Examples/Temp
 FeynCalc/Examples/*/WIP
 FeynCalc/Examples/WIP

FeynCalc/Changelog.md

@@ -55,6 +55,7 @@
 	DiracTraceEvaluate	-> False,
 	EpsContract			-> False,
 	EpsExpand			-> True,
+	EpsEvaluate			-> True,
 	Expand				-> True,
 	FCVerbose			-> False,
 	Factoring			-> Automatic,
@@ -217,18 +218,18 @@
 	unitMatrixTrace expr;
 
 diracTraceEvaluate[expr_/;!FreeQ[expr,DiracGamma], opts:OptionsPattern[]] :=
-	Block[ { diractrres, tmp = expr, diractrfact,
-		diractrcoll,
-		dtmp,dWrap,wrapRule,prepSpur,time,time2,contract,spurHeadList,spurHeadListChiral,spurHeadListNonChiral,
-		gammaFree,gammaPart,
-		traceListChiral,traceListNonChiral,repRule,null1,null2,dummyIndexFreeQ},
+	Block[{ diractrres, tmp = expr, diractrfact, diractrcoll,
+			dtmp,dWrap,wrapRule,prepSpur,time,time2,contract,spurHeadList,
+			spurHeadListChiral,spurHeadListNonChiral,gammaFree,gammaPart,
+		traceListChiral,traceListNonChiral,repRule,null1,null2,dummyIndexFreeQ, epsEvaluate},
 
 		wrapRule = {dWrap[5]->0, dWrap[6]->1/2, dWrap[7]->1/2, dWrap[LorentzIndex[_,_:4],___]->0,
 					dWrap[_. Momentum[_,_:4]+_:0,___]->0};
 
 		diractrfact = OptionValue[DiracTrace,{opts},Factoring];
 		diractrcoll = OptionValue[DiracTrace,{opts},PairCollect];
 		contract  	= OptionValue[DiracTrace,{opts},Contract];
+		epsEvaluate	= OptionValue[DiracTrace,{opts},EpsEvaluate];
 		west		= OptionValue[DiracTrace,{opts},West];
 		larinMVV	= OptionValue[DiracTrace,{opts},LarinMVV];
 
@@ -292,7 +293,6 @@
 			tmp = tmp/. spurHead[x__]/; !NonCommFreeQ[{x}/.DiracGamma->null1] :> noSpur[x];
 			FCPrint[3,"DiracTrace: diracTraceEvaluate: Trace contains unknown non-commutative objects: ", !FreeQ[tmp, noSpur], FCDoControl->diTrVerbose];
 
-
 			(* Split chiral projectors here *)
 			tmp = tmp /. {spurHead[x___,DiracGamma[6]] :> 1/2 spurHead[x] + 1/2 spurHead[x,DiracGamma[5]],
 			spurHead[x___,DiracGamma[7]] :> 1/2 spurHead[x] - 1/2 spurHead[x,DiracGamma[5]]} /. spurHead[] -> 1;
@@ -371,7 +371,7 @@
 
 			(* Evaluate the traces *)
 			time2=AbsoluteTime[];
-			FCPrint[1,"DiracTrace: diracTraceEvaluate: Calculating non-chiral traces.", FCDoControl->diTrVerbose];
+			FCPrint[1,"DiracTrace: diracTraceEvaluate: Calculating ", Length[spurHeadListChiral], " nonchiral traces.", FCDoControl->diTrVerbose];
 
 			traceListNonChiral = spurHeadListNonChiral/. spurHead-> spurNo5;
 			FCPrint[1,"DiracTrace: diracTraceEvaluate: Done calculating non-chiral traces, timing: ", N[AbsoluteTime[] - time2, 4], FCDoControl->diTrVerbose];
@@ -384,7 +384,7 @@
 			];
 
 			time2=AbsoluteTime[];
-			FCPrint[1,"DiracTrace: diracTraceEvaluate: Calculating chiral traces.", FCDoControl->diTrVerbose];
+			FCPrint[1,"DiracTrace: diracTraceEvaluate: Calculating ",Length[spurHeadListChiral]," chiral traces.", FCDoControl->diTrVerbose];
 			(* 	Purely 4 dimensional traces are always computed in the same way, regardless of the chosen scheme:
 				Eq 2.18 of R. Mertig, M. Boehm, A. Denner. Comp. Phys. Commun., 64 (1991)) *)
 			traceListChiral = spurHeadListChiral/. spurHead[x__]/;(FCGetDimensions[{x},ChangeDimension->True]==={4}) :> spur5In4Dim[x];
@@ -395,22 +395,25 @@
 
 					(*	NDR	*)
 					"NDR",
-						FCPrint[3,"DiracTrace: diracTraceEvaluate: Chiral traces will be left untouched (NDR scheme).", FCDoControl->diTrVerbose];
+						FCPrint[2,"DiracTrace: diracTraceEvaluate: Chiral traces will be left untouched (NDR scheme).", FCDoControl->diTrVerbose];
 						traceListChiral = traceListChiral/. spurHead -> noSpur,
 
 					(*	NDR-Discard	*)
 					"NDR-Discard",
-						FCPrint[3,"DiracTrace: diracTraceEvaluate: Chiral traces are set to zero (NDR-Discard scheme).", FCDoControl->diTrVerbose];
+						FCPrint[2,"DiracTrace: diracTraceEvaluate: Chiral traces are set to zero (NDR-Discard scheme).", FCDoControl->diTrVerbose];
 						traceListChiral = ConstantArray[0, Length[traceListChiral]],
 
 					(*	Larin	*)
 					"Larin",
-						FCPrint[3,"DiracTrace: diracTraceEvaluate: Chiral traces will be computed using Larin scheme", FCDoControl->diTrVerbose];
+						FCPrint[2,"DiracTrace: diracTraceEvaluate: Chiral traces will be computed using Larin scheme.", FCDoControl->diTrVerbose];
 
 						If[	larinMVV,
-							(* Larin, MVV trace formula *)
+							FCPrint[2,"DiracTrace: diracTraceEvaluate: Using the MVV trace formula.", FCDoControl->diTrVerbose];
+
 							traceListChiral = traceListChiral/. spurHead -> spur5LarinMVV,
-							(* Laring, standard (slow!) trace formula *)
+
+							FCPrint[2,"DiracTrace: diracTraceEvaluate: Using the standard slow trace formula.", FCDoControl->diTrVerbose];
+
 							traceListChiral = traceListChiral/. spurHead -> spur5Larin
 						],
 
@@ -496,7 +499,7 @@
 		];
 
 		(* Special expansion for expressions that contain Levi-Civita tensors*)
-		If[ !FreeQ[tmp, Eps],
+		If[ !FreeQ[tmp, Eps] && epsEvaluate,
 			time=AbsoluteTime[];
 			FCPrint[1,"DiracTrace: diracTraceEvaluate: Treating Eps tensors.", FCDoControl->diTrVerbose];
 			tmp = EpsEvaluate[tmp,FCI->True, EpsExpand->OptionValue[DiracTrace,{opts},EpsExpand]]//Expand;

FeynCalc/ChangelogOld.md

@@ -349,12 +349,17 @@ create replacement rules (standard)	and substitute the results back.
 diracTrickEvalFast[DiracGamma[6|7]]:=
 	1/2/; insideDiracTrace;
 
+(* Reordering of Dirac matrices using cyclicity of the trace *)
+
 diracTrickEvalFast[DOT[DiracGamma[(a:6|7)],b___,DiracGamma[(a:6|7)]]] :=
 	diracTrickEvalFast[DOT[b,DiracGamma[a]]]/; insideDiracTrace;
 
 diracTrickEvalFast[DOT[DiracGamma[(h1:5|6|7)],b___,DiracGamma[(h2:5|6|7)]]] :=
 	ga67MatSign[h1,h2] diracTrickEvalFast[DOT[b,ga67Mat[h1,h2]]]/; h1=!=h2 && insideDiracTrace;
 
+diracTrickEvalFast[DOT[DiracGamma[(h:5|6|7)],b__]] :=
+	diracTrickEvalFast[DOT[b,DiracGamma[h]]]/; insideDiracTrace;
+
 (*	Generic simplifications	*)
 
 diracTrickEvalFast[DOT[b___,DiracGamma[l_LorentzIndex], DiracGamma[l_LorentzIndex], d___]] :=
@@ -375,6 +380,8 @@ create replacement rules (standard)	and substitute the results back.
 diracTrickEvalFast[DOT[b___,DiracGamma[l_LorentzIndex, dim_:4], DiracGamma[c_Momentum, dim_:4], DiracGamma[l_LorentzIndex, dim_:4], d___]] :=
 	(2 - dim) diracTrickEvalFast[DOT[ b, DiracGamma[c,  dim], d ]];
 
+(* Neighboring g^5 and chiral projectors *)
+
 diracTrickEvalFast[DOT[b___,DiracGamma[5], DiracGamma[5], d___]] :=
 	diracTrickEvalFast[DOT[ b,d ]];
 
@@ -387,6 +394,7 @@ create replacement rules (standard)	and substitute the results back.
 diracTrickEvalFast[DOT[b___, DiracGamma[(hh1:6|7)],DiracGamma[(hh2:6|7)], c___]] :=
 	ga67Val2[hh1,hh2] diracTrickEvalFast[DOT[b, DiracGamma[hh2], c]];
 
+(* D-dimensional formulas for anticommuting g^5 (NDR only) *)
 
 diracTrickEvalFast[DOT[b___,DiracGamma[5], c:DiracGamma[_[_,__],_].. , d___]] :=
 	(-1)^Length[{c}] diracTrickEvalFast[DOT[ b,c,DiracGamma[5],d]]/; MemberQ[{"NDR","NDR-Discard"},FeynCalc`Package`DiracGammaScheme] &&
@@ -424,7 +432,7 @@ create replacement rules (standard)	and substitute the results back.
 	diracTrickEvalFast[DOT[b, dg, xy, DiracGamma[h], c]]/; OddQ[Length[{xy}]]  && MemberQ[{"NDR","NDR-Discard"},FeynCalc`Package`DiracGammaScheme]  &&
 		MatchQ[FCGetDimensions[{dg,xy}],{_Symbol}];
 
-
+(* 4-dimensional formulas for anticommuting g^5 *)
 diracTrickEvalFast[DOT[b___,DiracGamma[5], c:DiracGamma[_[__]].. , d___]] :=
 	(-1)^Length[{c}] diracTrickEvalFast[DOT[ b,c,DiracGamma[5],d]];
 
@@ -1562,7 +1570,7 @@ create replacement rules (standard)	and substitute the results back.
 Block[{li1,li2,li3},
 	{li1,li2,li3} = LorentzIndex[#,dim]& /@ Unique[{"dtlarLia","dtlarLib","dtlarLic"}];
 		mass chiralTrickLarin[b,DiracGamma[7],d] +
-		1/2 chiralTrickLarin[b,dg,d] +
+		1/2 chiralTrickLarin[b,dg,d] -
 		I/12 $LeviCivitaSign Eps[dg[[1]], li1, li2, li3] chiralTrickLarin[b,DiracGamma[li1,dim],DiracGamma[li2,dim],DiracGamma[li3,dim],d]
 	]/; !FreeQ2[{d},{DiracGamma[5],DiracGamma[6],DiracGamma[7]}] && NonCommFreeQ[mass];
 

FeynCalc/Dirac/DiracTrace.m

@@ -1,7 +1,3 @@
-```mathematica
- 
-```
-
 ## $FCDefaultLightconeVectorN
 
 `$FCDefaultLightconeVectorN` is  a global variable which is set to FCGV["n"]. It denotes the default name for the vector $n$ in the lightcone decomposition for Lorentz tensors.

FeynCalc/Dirac/DiracTrick.m

@@ -1,7 +1,3 @@
-```mathematica
- 
-```
-
 ## $FCDefaultLightconeVectorNB
 
 `$FCDefaultLightconeVectorNB` is  a global variable which is set to FCGV["nb"]. It denotes the default name for the vector $\bar{n}$ in the lightcone decomposition for Lorentz tensors.

FeynCalc/Documentation/Markdown/$FCDefaultLightconeVectorN.md

@@ -4,7 +4,7 @@
 
 ### See also
 
-[Overview](Extra/FeynCalc.md), [$FeynCalcDirectory]($FeynCalcDirectory.md).
+[Overview](Extra/FeynCalc.md), [\$FeynCalcDirectory](\$FeynCalcDirectory.md).
 
 ### Examples
 

FeynCalc/Documentation/Markdown/$FCDefaultLightconeVectorNB.md

@@ -4,7 +4,7 @@
 
 ### See also
 
-[Overview](Extra/FeynCalc.md), [$FeynArtsDirectory]($FeynArtsDirectory.md).
+[Overview](Extra/FeynCalc.md), [\$FeynArtsDirectory](\$FeynArtsDirectory.md).
 
 ### Examples
 

FeynCalc/Documentation/Markdown/$FeynArtsDirectory.md

@@ -1,7 +1,3 @@
-```mathematica
- 
-```
-
 ## $FeynCalcLastCommitDateHash
 
 The setting of `$FeynCalcLastCommitDateHash` provides the date and the hash of the last commit in the branch from which the current FeynCalc version originates.