Code

Bsm merge again#307

Code

Open

kostrzewa wants to merge 102 commits intomasterHISKP-LQCD/hadron:masterfrom bsm_merge_againHISKP-LQCD/hadron:bsm_merge_againCopy head branch name to clipboard

+1,680-140

Commits

Commits on Sep 26, 2019

• start working on adding reweighting options for hadron

  pittlerf

  committed
  9932c84

  Copy full SHA for 9932c84

• rw_orig added

  pittlerf

  committed
  b0ed038

  Copy full SHA for b0ed038

• reading function for reweighting factor

  pittlerf

  committed
  9b67c8b

  Copy full SHA for 9b67c8b

Commits on Sep 27, 2019

• Correcting errors

  pittlerf

  committed
  b678374

  Copy full SHA for b678374

• correcting errors

  pittlerf

  committed
  3dc4bfa

  Copy full SHA for 3dc4bfa

Commits on Sep 28, 2019

• adding possibility to reverse correlation functions

  pittlerf

  committed
  c1eb13c

  Copy full SHA for c1eb13c

Commits on Sep 29, 2019

• correcting errors

  pittlerf

  committed
  754d287

  Copy full SHA for 754d287

Commits on Sep 30, 2019

• renaming and error search

  pittlerf

  committed
  4b26f9f

  Copy full SHA for 4b26f9f

• corrected errors

  pittlerf

  committed
  12f0654

  Copy full SHA for 12f0654

• after multiplying two reweighting factors, you could not increase statistics by addStat

  pittlerf

  committed
  add1d1a

  Copy full SHA for add1d1a

• correcting error

  pittlerf

  committed
  32e577a

  Copy full SHA for 32e577a

• Implementing reweighting: setting the bootstrap or jackknife samples for the generated cf objects, and invalidating cf_orig, introduces a new class property cfrw_boot, if this option is on, than re…

  Show description for bed0b43
  pittlerf

  committed
  bed0b43

  Copy full SHA for bed0b43

• removing testing print statements

  pittlerf

  committed
  b88a01a

  Copy full SHA for b88a01a

• correcting errors

  pittlerf

  committed
  95e7ce7

  Copy full SHA for 95e7ce7

Commits on Oct 1, 2019

• Performing gauge conf list check in reweighting

  pittlerf

  committed
  7275044

  Copy full SHA for 7275044

• Including it in jackknife as well

  pittlerf

  committed
  c9aa2a5

  Copy full SHA for c9aa2a5

• Typo corrected

  pittlerf

  committed
  a871557

  Copy full SHA for a871557

Commits on Oct 2, 2019

• Specify dependency on dplyr

  pittlerf

  committed
  6e6664d

  Copy full SHA for 6e6664d

• function that averages correlation functions just over the stochastic samples included

  pittlerf

  committed
  ed4879c

  Copy full SHA for ed4879c

• Comparing two vectors with identical()

  pittlerf

  committed
  b35557c

  Copy full SHA for b35557c

• by mistake I have deleted man/addStat.cf.Rd

  pittlerf

  committed
  1240d30

  Copy full SHA for 1240d30

• Errors for Rd file jackknife corrected

  pittlerf

  committed
  191f0ba

  Copy full SHA for 191f0ba

• Errors for Rd file cf_boot corrected

  pittlerf

  committed
  430be22

  Copy full SHA for 430be22

• Further errors corrected

  pittlerf

  committed
  08ef589

  Copy full SHA for 08ef589

• Correct cf_boot

  pittlerf

  committed
  0bbd5a2

  Copy full SHA for 0bbd5a2

• additional Rd files uploaded

  pittlerf

  committed
  fc6e7dd

  Copy full SHA for fc6e7dd

Commits on Oct 3, 2019

• removing averaging over stochastic samples

  pittlerf

  committed
  1cf72f3

  Copy full SHA for 1cf72f3

• correcting the appropriate man file as well

  pittlerf

  committed
  17c3058

  Copy full SHA for 17c3058

• correcting for the behaviour of is.na in if statement

  pittlerf

  committed
  81db664

  Copy full SHA for 81db664

• correcting testing for icf

  pittlerf

  committed
  0dda8b2

  Copy full SHA for 0dda8b2

Commits on Oct 8, 2019

• Simplifying bootstrap_rwcf and jackknife_rwcf

  pittlerf

  committed
  548eb99

  Copy full SHA for 548eb99

Commits on Nov 8, 2019

• Using functions from branch icf_support

  pittlerf

  committed
  0fb2b42

  Copy full SHA for 0fb2b42

• input parameter types for jackknife_rw.cf

  pittlerf

  committed
  f17f73a

  Copy full SHA for f17f73a

• Adding more clarifications and correcting typo

  pittlerf

  committed
  2cf8814

  Copy full SHA for 2cf8814

• Merge pull request #195 from HISKP-LQCD/icf_support

  Show description for 0d5ab14
  pittlerf

  authored
  0d5ab14

  Copy full SHA for 0d5ab14

Commits on Nov 12, 2019

• Merge remote-tracking branch 'origin/origin/reweighting' into origin/reweighting

  pittlerf

  committed
  865dcaf

  Copy full SHA for 865dcaf

• try to upload modifications

  pittlerf

  committed
  74b3f53

  Copy full SHA for 74b3f53

• Consistent assignments

  pittlerf

  committed
  67ad0c1

  Copy full SHA for 67ad0c1

• mixin reintroducted

  pittlerf

  committed
  25e64dc

  Copy full SHA for 25e64dc

• Example for addStat.cf documentation

  pittlerf

  committed
  284c9dd

  Copy full SHA for 284c9dd

• the same explanation for combining replicas for reweighting factors

  pittlerf

  committed
  dd99b7c

  Copy full SHA for dd99b7c

• including dplyr in DESCRIPTION

  pittlerf

  committed
  184f86e

  Copy full SHA for 184f86e

• for names of columns in reweighting factor made some explanations

  pittlerf

  committed
  bd71437

  Copy full SHA for bd71437

• remove default argument for conf.index

  pittlerf

  committed
  dbcbe71

  Copy full SHA for dbcbe71

• Rd files added

  pittlerf

  committed
  567e108

  Copy full SHA for 567e108

• adding red colors for plotting negativ values

  pittlerf

  committed
  d60a89e

  Copy full SHA for d60a89e

• uploading Rd file

  pittlerf

  committed
  f93326d

  Copy full SHA for f93326d

Commits on Nov 13, 2019

• correcting names of columns in tmp

  pittlerf

  committed
  b3d9073

  Copy full SHA for b3d9073

• started to implement PLEGMA readers for baryon correlation function

  pittlerf

  committed
  87f6dd2

  Copy full SHA for 87f6dd2

Commits on Nov 14, 2019

• Finalize merging

  pittlerf

  committed
  b226aa5

  Copy full SHA for b226aa5

Commits on Nov 26, 2019

• trying to fix conflicts

  pittlerf

  committed
  7e0d32d

  Copy full SHA for 7e0d32d

• trying to fix conflicts

  pittlerf

  committed
  4140e6e

  Copy full SHA for 4140e6e

• trying to correct conflicts

  pittlerf

  committed
  6d6d7ae

  Copy full SHA for 6d6d7ae

• trying to fix conflicts

  pittlerf

  committed
  4f9111e

  Copy full SHA for 4f9111e

• resolving conflicts

  pittlerf

  committed
  d64dec0

  Copy full SHA for d64dec0

• resolving conflicts again

  pittlerf

  committed
  266da59

  Copy full SHA for 266da59

• resolve intergration error

  pittlerf

  committed
  603f177

  Copy full SHA for 603f177

• adding errors in plotting the reweighting factors

  pittlerf

  committed
  a714c51

  Copy full SHA for a714c51

• changing back to roxygen700

  pittlerf

  committed
  ea0b6e6

  Copy full SHA for ea0b6e6

• fixing conflicts

  pittlerf

  committed
  b43b5d3

  Copy full SHA for b43b5d3

• resolving integration test further

  pittlerf

  committed
  aa378e9

  Copy full SHA for aa378e9

• Removing str

  pittlerf

  committed
  71bbeb8

  Copy full SHA for 71bbeb8

Commits on Nov 28, 2019

• Merge branch 'origin/reweighting' into plegmareading

  pittlerf

  committed
  ae63ad6

  Copy full SHA for ae63ad6

• Adding reading routine for baryon correlation functions

  pittlerf

  committed
  9f6df2f

  Copy full SHA for 9f6df2f

• Adding reading routine for baryon correlation functions

  pittlerf

  committed
  bdc0043

  Copy full SHA for bdc0043

Commits on Nov 29, 2019

• including symmetrization in baryon reading

  pittlerf

  committed
  af37e10

  Copy full SHA for af37e10

• additional dependency added

  pittlerf

  committed
  9d68e21

  Copy full SHA for 9d68e21

• typo-s corrected

  pittlerf

  committed
  8a1a20c

  Copy full SHA for 8a1a20c

Commits on Dec 2, 2019

• reading baryon correlation function now direvtly in cf type, later introducing projection isospin and gamma

  pittlerf

  committed
  e7b1479

  Copy full SHA for e7b1479

Commits on Feb 20, 2020

• add function for computing GL FSE correction factors

  kostrzewa

  committed
  9324194

  Copy full SHA for 9324194

Commits on Feb 21, 2020

• remove outdated documentation and unnecessary parameters from gl_fse_corr

  kostrzewa

  committed
  0444b7b

  Copy full SHA for 0444b7b

Commits on Apr 29, 2020

• merging with master

  pittlerf

  committed
  1327fce

  Copy full SHA for 1327fce

• removing compilation error

  pittlerf

  committed
  48f5864

  Copy full SHA for 48f5864

Commits on May 4, 2020

• reading 2pt functions for piN scattering

  pittlerf

  committed
  7d13238

  Copy full SHA for 7d13238

Commits on May 5, 2020

• optimazition of the reading routin

  pittlerf

  committed
  68b880e

  Copy full SHA for 68b880e

Commits on May 6, 2020

• Adding symmetrization to the baryon correlation function for scattering projects

  pittlerf

  committed
  8b021db

  Copy full SHA for 8b021db

Commits on May 8, 2020

• reading of the B,W,Z diagramms

  pittlerf

  committed
  6855836

  Copy full SHA for 6855836

• correcting bugs

  pittlerf

  committed
  f4d39b1

  Copy full SHA for f4d39b1

Commits on May 26, 2020

• Merge tag '3.1.0' into HEAD

  pittlerf

  committed
  12b9ffa

  Copy full SHA for 12b9ffa

Commits on Jun 12, 2020

• correcting bug

  pittlerf

  committed
  33b0f4f

  Copy full SHA for 33b0f4f

Commits on Jun 18, 2020

• updating calc2pt baryon correlation function key

  pittlerf

  committed
  03e5cf8

  Copy full SHA for 03e5cf8

• Merge branch 'plegmareading' of github.com:HISKP-LQCD/hadron into HEAD

  pittlerf

  committed
  3a24628

  Copy full SHA for 3a24628

Commits on Jun 20, 2020

• modifying the key according to new format

  pittlerf

  committed
  5a06ed1

  Copy full SHA for 5a06ed1

• Merge remote-tracking branch 'origin' into HEAD

  pittlerf

  committed
  12c0956

  Copy full SHA for 12c0956

Commits on Jun 23, 2020

• reading files containing all the gauge configuartions

  pittlerf

  committed
  9f626a4

  Copy full SHA for 9f626a4

Commits on Jul 14, 2020

• removing separate reading 4pt,2pt, now just one general reading routine for scattering diagrams

  pittlerf

  committed
  d07f473

  Copy full SHA for d07f473

• addign namespace as well

  pittlerf

  committed
  c61f28c

  Copy full SHA for c61f28c

Commits on Jul 18, 2020

• Merge remote-tracking branch 'origin/master' into gl_fse

  kostrzewa

  committed
  d965f4c

  Copy full SHA for d965f4c

Commits on Sep 29, 2020

• fit model for single and multiple baryons are added, with simple exponential not a cosh

  pittlerf

  committed
  63b98c1

  Copy full SHA for 63b98c1

• correcting baryon correlation function reader, we only read already projected baryon correlation functoions

  pittlerf

  committed
  3aa936f

  Copy full SHA for 3aa936f

• doing the merge with current master

  pittlerf

  committed
  02c9c93

  Copy full SHA for 02c9c93

• erge remote-tracking branch 'origin' into HEAD

  pittlerf

  committed
  7543f68

  Copy full SHA for 7543f68

• Merge remote-tracking branch 'origin/gl_fse' into HEAD

  pittlerf

  committed
  6b3767a

  Copy full SHA for 6b3767a

Commits on Nov 11, 2020

• correcting errors

  pittlerf

  committed
  a311538

  Copy full SHA for a311538

Commits on Apr 20, 2021

• Solving the gevp even when the matrix C(t0) is not positive definite

  pittlerf

  committed
  5a0bb00

  Copy full SHA for 5a0bb00

Commits on May 5, 2021

• merging the bsm_readutils branch with my current hadron

  pittlerf

  committed
  01bd639

  Copy full SHA for 01bd639

Commits on May 6, 2021

• finalizing the merge

  pittlerf

  committed
  7dcf226

  Copy full SHA for 7dcf226

• merging with plegmareading_develop

  pittlerf

  committed
  3c1ba1a

  Copy full SHA for 3c1ba1a

• finalizing merge

  pittlerf

  committed
  db39c09

  Copy full SHA for db39c09

Commits on Mar 17, 2022

• Merge remote-tracking branch 'origin/master' into bsm_merge

  kostrzewa

  committed
  c1a0d83

  Copy full SHA for c1a0d83

• the documentation is now auto-generated

  kostrzewa

  committed
  09dc280

  Copy full SHA for 09dc280

• NAMESPACE file auto-generated

  kostrzewa

  committed
  63fea02

  Copy full SHA for 63fea02