[go: nahoru, domu]
Skip to content

Commit

Permalink
Merge branch 'master' of ssh://stash.desy.de:7999/b2/software into fe…
Browse files Browse the repository at this point in the history 
…ature/update-copyright-statement-in-some-packages
  • Loading branch information
@GiacomoXT
GiacomoXT committed Jul 6, 2021
2 parents b605f7d + b11713c commit e640605
Show file tree
Hide file tree
Showing 973 changed files with 28,378 additions and 7,000 deletions.
8 changes: 3 additions & 5 deletions alignment/calibration/include/MillepedeAlgorithm.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2010 - Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
8 changes: 3 additions & 5 deletions alignment/calibration/include/MillepedeTreeConversionAlgorithm.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2017 Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Kirill Chilikin *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
16 changes: 12 additions & 4 deletions alignment/calibration/src/MillepedeAlgorithm.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@
#include <alignment/PedeApplication.h>
#include <alignment/PedeResult.h>
#include <framework/database/EventDependency.h>
#include <framework/utilities/FileSystem.h>

#include <TH1F.h>
#include <TTree.h>



using namespace std;
using namespace Belle2;
using namespace alignment;
Expand All @@ -36,8 +39,13 @@ CalibrationAlgorithm::EResult MillepedeAlgorithm::calibrate()
// Write out binary files from tree and add to steering
prepareMilleBinary();
auto mille = getObjectPtr<MilleData>("mille");
for (auto file : mille->getFiles())
for (auto file : mille->getFiles()) {
if (!FileSystem::fileExists(file)) {
B2ERROR("Missing file: " << file);
continue;
}
m_steering.addFile(file);
}

// Run calibration on steering
m_result = m_pede.calibrate(m_steering);
Expand All @@ -63,10 +71,10 @@ CalibrationAlgorithm::EResult MillepedeAlgorithm::calibrate()


// This function gives you the vector of ExpRuns that were requested for this execution only
//auto expRuns = getRunList();
auto expRuns = getRunList();

// Or you can inspect all the input files to get the full RunRange
auto expRuns = getRunListFromAllData();
// Do not use full data range - would not work with SequentialRunByRun strategy:
//auto expRuns = getRunListFromAllData();

int undeterminedParams = 0;
double maxCorrectionPull = 0.;
Expand Down
8 changes: 3 additions & 5 deletions alignment/calibration/src/MillepedeTreeConversionAlgorithm.cc
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2017 Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Kirill Chilikin *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#include <alignment/calibration/MillepedeTreeConversionAlgorithm.h>
Expand Down
8 changes: 3 additions & 5 deletions alignment/dbobjects/include/CDCCalibration.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2010 - Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
8 changes: 3 additions & 5 deletions alignment/dbobjects/include/VXDAlignment.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2010 - Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
8 changes: 3 additions & 5 deletions alignment/include/GblMultipleScatteringController.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2010 - Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
8 changes: 3 additions & 5 deletions alignment/include/GlobalDerivatives.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2015 Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
8 changes: 3 additions & 5 deletions alignment/include/GlobalLabel.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2015 Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
8 changes: 3 additions & 5 deletions alignment/include/GlobalParam.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2015 Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
8 changes: 3 additions & 5 deletions alignment/include/GlobalTimeLine.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2019 - Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
8 changes: 3 additions & 5 deletions alignment/include/Hierarchy.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2015 Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
8 changes: 3 additions & 5 deletions alignment/include/Manager.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2015 Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
8 changes: 3 additions & 5 deletions alignment/include/PedeApplication.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2015 Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
8 changes: 3 additions & 5 deletions alignment/include/PedeResult.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2015 Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Tadeas Bilka *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
10 changes: 3 additions & 7 deletions alignment/modules/AlignmentDQM/include/AlignDQMEventProcessor.h
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2020 - Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Jachym Bartik *
* *
* Prepared for Alignment DQM *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
11 changes: 3 additions & 8 deletions alignment/modules/AlignmentDQM/include/AlignDQMModule.h
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2020 - Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Peter Kodys, Jachym Bartik *
* *
* Prepared for track quality check *
* Prepared for Phase 2 and Belle II geometry *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
10 changes: 3 additions & 7 deletions alignment/modules/AlignmentDQM/src/AlignDQMEventProcessor.cc
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2020 - Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Jachym Bartik *
* *
* Prepared for Alignment DQM *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#include <alignment/modules/AlignmentDQM/AlignDQMEventProcessor.h>
Expand Down
10 changes: 3 additions & 7 deletions alignment/modules/AlignmentDQM/src/AlignDQMModule.cc
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2020 - Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: Peter Kodys, Jachym Bartik *
* *
* Prepared for Alignment DQM *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#include <alignment/modules/AlignmentDQM/AlignDQMModule.h>
Expand Down
8 changes: 3 additions & 5 deletions alignment/modules/AlignmentGenerator/include/AlignmentGeneratorModule.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/**************************************************************************
* BASF2 (Belle Analysis Framework 2) *
* Copyright(C) 2015 - Belle II Collaboration *
* *
* basf2 (Belle II Analysis Software Framework) *
* Author: The Belle II Collaboration *
* Contributors: tadeas *
* *
* This software is provided "as is" without any warranty. *
* See git log for contributors and copyright holders. *
* This file is licensed under LGPL-3.0, see LICENSE.md. *
**************************************************************************/

#pragma once
Expand Down
Loading

0 comments on commit e640605

Please sign in to comment.