Modifs after addind dataPath as argument of initData()

Author: Alexandre Bigot

Detectors/ITSMFT/common/data/alpideResponseData/CMakeLists.txt

@@ -17,8 +17,11 @@
 o2_add_test_root_macro(alpideResponse.C
     LABELS "its;mft")
 
-#add_custom_command(COMMAND root -b -q alpideResponse.C+)
-#COMMENT "Storing AlpideResponseData for Vbb=0V and -3V in a .root file")
+#add_executable(alpide alpideResponse.C)
+#add_custom_command(TARGET alpide
+#    POST_BUILD
+#    COMMAND root -b -q alpideResponse.C+
+#    COMMENT "Storing AlpideResponseData for Vbb=0V and -3V in a .root file")
 
 #set(FILE "hello.txt")
 

Detectors/ITSMFT/common/data/alpideResponseData/alpideResponse.C

@@ -6,20 +6,20 @@
 #include <fstream>
 #include <iostream>
 
-//ClassImp(o2::itsmft::AlpideSimResponse);
-
 void alpideResponse()
 {
     o2::itsmft::AlpideSimResponse resp0, resp1;
 
-    std::string mDataPath = "$O2_ROOT/share/Detectors/ITSMFT/data/alpideResponseData/";
-    gSystem->Exec("mkdir -p mDataPath");
-    std::string dataFile = mDataPath + "AlpideResponseData.root";
+    std::string outputPath = "$O2_ROOT/share/Detectors/ITSMFT/data/alpideResponseData/";
+    std::string mkdirCommand = "mkdir -p " + outputPath;
+    gSystem->Exec(mkdirCommand.data());
+    std::string responseFile = outputPath + "AlpideResponseData.root";
 
-    resp0.initData(0);
-    resp1.initData(1);
+    std::string dataPath = "/home/abigot/alice/O2/Detectors/ITSMFT/common/data/alpideResponseData/";
+    resp0.initData(0, dataPath.data());
+    resp1.initData(1, dataPath.data());
 
-    auto file = TFile::Open(dataFile.data(),"recreate");
+    auto file = TFile::Open(responseFile.data(), "new");
     file->WriteObjectAny(&resp0,"o2::itsmft::AlpideSimResponse","response0");
     file->WriteObjectAny(&resp1,"o2::itsmft::AlpideSimResponse","response1");
     file->Close();

Detectors/ITSMFT/common/simulation/include/ITSMFTSimulation/AlpideSimResponse.h

@@ -106,7 +106,7 @@ class AlpideSimResponse
   float mStepInvDpt = 0;               /// inverse step of the Dpt grid
   std::vector<AlpideRespSimMat> mData; /// response data
   /// path to look for data file
-  //std::string mDataPath = "$(O2_ROOT)/share/Detectors/ITSMFT/data/alpideResponseData/";
+  std::string mDataPath;
   std::string mGridColName = "grid_list_x.txt";             /// name of the file with grid in Col
   std::string mGridRowName = "grid_list_y.txt";             /// name of the file with grid in Row
   std::string mColRowDataFmt = "data_pixels_%.2f_%.2f.txt"; /// format to read the data for given Col,Row
@@ -115,7 +115,7 @@ class AlpideSimResponse
   AlpideSimResponse() = default;
   ~AlpideSimResponse() = default;
 
-  void initData(int tableNumber, std::string mDataPath);  // FIXME TEMPORARY NAME FOR DATA PATH !!!
+  void initData(int tableNumber, std::string dataPath);
 
   bool getResponse(float vRow, float vCol, float cDepth, AlpideRespSimMat& dest) const;
   const AlpideRespSimMat* getResponse(float vRow, float vCol, float vDepth, bool& flipRow, bool& flipCol) const;

Detectors/ITSMFT/common/simulation/include/ITSMFTSimulation/Digitizer.h

@@ -127,7 +127,7 @@ class Digitizer : public TObject
   o2::itsmft::AlpideSimResponse* mAlpSimRespIB = nullptr;
   o2::itsmft::AlpideSimResponse* mAlpSimRespOB = nullptr;
   o2::itsmft::AlpideSimResponse mAlpSimResp[2]; // simulated response
-  std::string mdataFile = "$(O2_ROOT)/share/Detectors/ITSMFT/data/alpideResponseData/AlpideResponseData.root";
+  std::string mResponseFile = "$(O2_ROOT)/share/Detectors/ITSMFT/data/alpideResponseData/AlpideResponseData.root";
   const o2::itsmft::GeometryTGeo* mGeometry = nullptr; ///< ITS OR MFT upgrade geometry
 
   std::vector<o2::itsmft::ChipDigitsContainer> mChips; ///< Array of chips digits containers

Detectors/ITSMFT/common/simulation/src/AlpideSimResponse.cxx

@@ -30,18 +30,18 @@ ClassImp(o2::itsmft::AlpideRespSimMat);
 
 constexpr float micron2cm = 1e-4;
 
-void AlpideSimResponse::initData(int tableNumber, int mDataPath)
+void AlpideSimResponse::initData(int tableNumber, std::string dataPath)
 {
   /*
    * read grid parameters and load data
    */
   if (tableNumber == 0) // 0V back bias
   {
-    const std::string newDataPath = mDataPath + "Vbb-0.0V"; 
+    const std::string newDataPath = dataPath + "Vbb-0.0V"; 
     setDataPath(newDataPath);                               // setting the new data path
   } else if (tableNumber == 1)                              // -3V back bias
   {
-    const std::string newDataPath = mDataPath + "Vbb-3.0V";
+    const std::string newDataPath = dataPath + "Vbb-3.0V";
     setDataPath(newDataPath); // setting the new data path
   }
 

Detectors/ITSMFT/common/simulation/src/Digitizer.cxx

@@ -55,7 +55,7 @@ void Digitizer::init()
 
   // importing the charge collection tables
   // (initialized while building O2)
-  auto file = TFile::Open(mdataFile.data());
+  auto file = TFile::Open(mResponseFile.data());
   /*std::string response = "response";
   for (int i=0; i<2; i++) {
     response.append(std::to_string(i));

Detectors/ITSMFT/common/simulation/test/testAlpideSimResponse.cxx

@@ -15,15 +15,18 @@
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 #include "ITSMFTSimulation/AlpideSimResponse.h"
-#include <fairlogger/Logger.h>
+#include "FairLogger.h"
+#include <TFile.h>
 
 using namespace o2::itsmft;
 
 BOOST_AUTO_TEST_CASE(AlpideSimResponse_test)
 {
   // test for the templated Descriptor struct
-  AlpideSimResponse resp;
-  resp.initData(1);
+  std::string responseFile = "$(O2_ROOT)/share/Detectors/ITSMFT/data/alpideResponseData/AlpideResponseData.root";
+  auto file = TFile::Open(responseFile.data());
+  AlpideSimResponse resp = *(o2::itsmft::AlpideSimResponse*)file->Get("response1");
+
   float vCol = 1.e-4, vRow = 1.e-4, vDepth = 10.e-4;
   LOG(info) << "Checking response from vRow:" << vCol << " vCol:" << vCol
             << " Depth:" << vDepth;

Detectors/Upgrades/IT3/simulation/include/ITS3Simulation/Digitizer.h

@@ -120,7 +120,7 @@ class Digitizer : public TObject
   uint32_t mEventROFrameMin = 0xffffffff; ///< lowest RO frame for processed events (w/o automatic noise ROFs)
   uint32_t mEventROFrameMax = 0;          ///< highest RO frame forfor processed events (w/o automatic noise ROFs)
 
-  std::unique_ptr<o2::itsmft::AlpideSimResponse> mAlpSimResp; // simulated response
+  o2::itsmft::AlpideSimResponse* mAlpSimResp = nullptr; // simulated response
 
   const o2::its3::GeometryTGeo* mGeometry = nullptr; ///< ITS OR MFT upgrade geometry
 

Detectors/Upgrades/IT3/simulation/src/Digitizer.cxx

@@ -47,9 +47,10 @@ void Digitizer::init()
     mChips[i].setChipIndex(i);
   }
   if (!mParams.getAlpSimResponse()) {
-    mAlpSimResp = std::make_unique<o2::itsmft::AlpideSimResponse>();
-    mAlpSimResp->initData(1);
-    mParams.setAlpSimResponse(mAlpSimResp.get());
+    std::string responseFile = "$(O2_ROOT)/share/Detectors/ITSMFT/data/alpideResponseData/AlpideResponseData.root";
+    auto file = TFile::Open(responseFile.data());
+    mAlpSimResp = (o2::itsmft::AlpideSimResponse*)file->Get("response1");
+    mParams.setAlpSimResponse(mAlpSimResp);
   }
   mParams.print();
   mIRFirstSampledTF = o2::raw::HBFUtils::Instance().getFirstSampledTFIR();