Merge pull request #464 from gundam-organization/feature/toyParInjector

(re-)Adding toy parameter injector

src/Applications/src/gundamFitter.cxx

@@ -58,6 +58,7 @@ int main(int argc, char** argv){
   clParser.addOption("useDataEntry", {"--use-data-entry"}, "Overrides \"selectedDataEntry\" in dataSet config. Second arg is to select a given dataset");
   clParser.addOption("useDataConfig", {"--use-data-config"}, "Add a data entry to the data set definition and use it for the fit");
   clParser.addOption("injectParameterConfig", {"--inject-parameters"}, "Inject parameters defined in the provided config file");
+  clParser.addOption("injectToyParameters", {"--inject-toy-parameter"}, "Inject parameters defined in the provided config file");
   clParser.addOption("appendix", {"--appendix"}, "Add appendix to the output file name");
 
   clParser.addDummyOption("Trigger options");
@@ -140,6 +141,13 @@ int main(int argc, char** argv){
     injectParameterPath = clParser.getOptionVal<std::string>("injectParameterConfig");
   }
 
+  // toy par injector
+  std::string toyParInjector{};
+  if( clParser.isOptionTriggered("injectToyParameters") ){
+    toyParInjector = clParser.getOptionVal<std::string>("injectToyParameters");
+    LogWarning << "Inject toy parameter: " << toyParInjector << std::endl;
+  }
+
   // PRNG seed?
   gRandom = new TRandom3(0);    // Initialize with a UUID;
   if( clParser.isOptionTriggered("randomSeed") ){
@@ -189,6 +197,7 @@ int main(int argc, char** argv){
         {"kickMc", "KickMc"},
         {"lightOutputMode", "Light"},
         {"toyFit", "ToyFit_%s"},
+        {"injectToyParameters", "InjToyPar_%s"},
         {"dry-run", "DryRun"},
         {"appendix", "%s"},
     };
@@ -295,6 +304,12 @@ int main(int argc, char** argv){
     fitter.getLikelihoodInterface().getDataSetManager().getPropagator().setParameterInjectorConfig(injectConfig);
   }
 
+  // toyParInjector
+  if( not toyParInjector.empty() ){
+    auto injectConfig = ConfigUtils::readConfigFile( toyParInjector );
+    fitter.getLikelihoodInterface().getDataSetManager().setToyParameterInjector( injectConfig );
+  }
+
   // Also check app level config options
   GenericToolbox::Json::deprecatedAction(configHandler.getConfig(), "generateSamplePlots", [&]{
     LogAlert << "Forwarding the option to FitterEngine. Consider moving it into \"fitterEngineConfig:\"" << std::endl;

src/DatasetManager/include/DataSetManager.h

@@ -20,6 +20,9 @@ class DataSetManager : public JsonBaseClass {
 public:
   DataSetManager() = default;
 
+  // setters
+  void setToyParameterInjector(const JsonType& toyParameterInjector_){ _toyParameterInjector_ = toyParameterInjector_; }
+
   // const-getters
   [[nodiscard]] const Propagator& getPropagator() const{ return _propagator_; }
   [[nodiscard]] const EventTreeWriter& getTreeWriter() const{ return _treeWriter_; }
@@ -39,6 +42,8 @@ class DataSetManager : public JsonBaseClass {
   EventTreeWriter _treeWriter_{};
   std::vector<DatasetDefinition> _dataSetList_{};
 
+  JsonType _toyParameterInjector_{};
+
 };
 
 

src/DatasetManager/src/DataSetManager.cpp

@@ -58,6 +58,7 @@ void DataSetManager::loadData(){
   bool cacheManagerState = GundamGlobals::getEnableCacheManager();
   GundamGlobals::setEnableCacheManager(false);
 
+
   // make sure everything is ready for loading
   _propagator_.clearContent();
 
@@ -92,7 +93,6 @@ void DataSetManager::loadData(){
   // Copy to data container
   if( usedMcContainer ){
     if( _propagator_.isThrowAsimovToyParameters() ){
-      LogWarning << "Will throw toy parameters..." << std::endl;
 
       if( _propagator_.isShowEventBreakdown() ){
         LogInfo << "Propagating prior parameters on the initially loaded events..." << std::endl;
@@ -117,17 +117,24 @@ void DataSetManager::loadData(){
         }
       }
 
-      _propagator_.getParametersManager().throwParameters();
+      if( _toyParameterInjector_.empty() ){
+        LogWarning << "Will throw toy parameters..." << std::endl;
+        _propagator_.getParametersManager().throwParameters();
 
-      // Handling possible masks
-      for( auto& parSet : _propagator_.getParametersManager().getParameterSetsList() ){
-        if( not parSet.isEnabled() ) continue;
+        // Handling possible masks
+        for( auto& parSet : _propagator_.getParametersManager().getParameterSetsList() ){
+          if( not parSet.isEnabled() ) continue;
 
-        if( parSet.isMaskForToyGeneration() ){
-          LogWarning << parSet.getName() << " will be masked for the toy generation." << std::endl;
-          parSet.setMaskedForPropagation( true );
+          if( parSet.isMaskForToyGeneration() ){
+            LogWarning << parSet.getName() << " will be masked for the toy generation." << std::endl;
+            parSet.setMaskedForPropagation( true );
+          }
         }
       }
+      else{
+        LogWarning << "Injecting parameters..." << std::endl;
+        _propagator_.getParametersManager().injectParameterValues( _toyParameterInjector_ );
+      }
 
     } // throw asimov?
 
@@ -191,6 +198,9 @@ void DataSetManager::loadData(){
   }
 #endif
 
+  LogInfo << "Propagating prior parameters on events..." << std::endl;
+  _propagator_.reweightMcEvents();
+
   LogInfo << "Filling up sample bin caches..." << std::endl;
   GundamGlobals::getParallelWorker().runJob([this](int iThread){
     LogInfoIf(iThread <= 0) << "Updating sample per bin event lists..." << std::endl;
@@ -236,8 +246,9 @@ void DataSetManager::loadData(){
   /// Now caching the event for the plot generator
   _propagator_.getPlotGenerator().defineHistogramHolders();
 
-  GundamGlobals::setEnableCacheManager(cacheManagerState);
-
   /// Propagator needs to be fast, let the workers wait for the signal
   GundamGlobals::getParallelWorker().setCpuTimeSaverIsEnabled(false);
+
+  /// restoring state
+  GundamGlobals::setEnableCacheManager(cacheManagerState);
 }

src/Propagator/include/Propagator.h

@@ -62,6 +62,7 @@ class Propagator : public JsonBaseClass {
   // Core
   void buildDialCache();
   void propagateParameters();
+  void resetEventWeights();
   void reweightMcEvents();
   void refillMcHistograms();
   void clearContent();

src/Propagator/src/Propagator.cpp

@@ -160,12 +160,15 @@ void Propagator::propagateParameters(){
   this->refillMcHistograms();
 
 }
+void Propagator::resetEventWeights(){
+  std::for_each(_dialCollectionList_.begin(), _dialCollectionList_.end(), [&]( DialCollection& dc_){
+    dc_.updateInputBuffers();
+  });
+}
 void Propagator::reweightMcEvents() {
   reweightTimer.start();
 
-  std::for_each(_dialCollectionList_.begin(), _dialCollectionList_.end(), [&]( DialCollection& dc_ ){
-    dc_.updateInputBuffers();
-  });
+  resetEventWeights();
 
   bool usedGPU{false};
 #ifdef GUNDAM_USING_CACHE_MANAGER
@@ -258,8 +261,6 @@ void Propagator::printBreakdowns(){
     }
 
     this->reweightMcEvents();
-
-    // no reweight
     for( size_t iSample = 0 ; iSample < _sampleSet_.getSampleList().size() ; iSample++ ){
       stageBreakdownList[iSample][iStage] = _sampleSet_.getSampleList()[iSample].getMcContainer().getSumWeights();
     }

src/StatisticalInference/Likelihood/src/LikelihoodInterface.cpp

@@ -73,11 +73,14 @@ void LikelihoodInterface::initializeImpl() {
     _nbSampleBins_ += int(sample.getBinning().getBinList().size() );
   }
 
+  LogInfo << "Move back MC parameters to prior..." << std::endl;
+  _dataSetManager_.getPropagator().getParametersManager().moveParametersToPrior();
+
   /// some joint fit probability might need to save the value of the nominal histogram.
   /// here we know every parameter is at its nominal value
   LogInfo << "First evaluation of the LLH at the nominal value..." << std::endl;
-  _dataSetManager_.getPropagator().getParametersManager().moveParametersToPrior();
   this->propagateAndEvalLikelihood();
+  LogInfo << this->getSummary() << std::endl;
 
   /// move the parameter away from the prior if needed
   if( not _dataSetManager_.getPropagator().getParameterInjectorMc().empty() ){