remove files

Author: AllaMaevskaya

Detectors/FIT/FT0/base/files/Sim2DataChannels.txt

@@ -1,3 +1,2 @@
 82  83  80  81  89  91  88  90  93  95  92  94  4  6  5  7  8  10  9  11  78  79  76  77  74  75  72  73  85  87  84  86  0  2  1  3  16  17  18  19  71  70  69  68  63  62  61  60  12  13  14  15  20  21  22  23  67  66  65  64  51  49  50  48  38  36  39  37  25  24  27  26  29  28  31  30  59  57  58  56  55  53  54  52  46  44  47  45  42  40  43  41  33  32  35  34  117  119  116  118  113  115  112  114  124  126  125  127  128  130  129  131  106  107  104  105  193  195  192  194  109  111  108  110  120  122  121  123  196  197  198  199  140  141  142  143  102  103  100  101  98  99  96  97  132  133  134  135  136  137  138  139  187  186  185  184  183  182  181  180  145  144  147  146  148  149  151  150  191  190  189  188  211  210  209  208 171  169  170  168  158  156  159  157  206  204  207  205
 153  152  155  154  179  177  178  176  175  173  174  172  162  160  163  161  166  164  167  165
-

Detectors/FIT/FT0/base/include/FT0Base/Geometry.h

@@ -43,7 +43,7 @@ class Geometry
 
   ///
   TVector3 centerMCP(int imcp) { return mMCP[imcp]; }
-  TVector3 tiltMCP(int imcp) { return mAngels[imcp]; }
+  TVector3 tiltMCP(int imcp) { return mAngles[imcp]; }
 
   static constexpr int Nchannels = 229;                     // number of LUT channels
   static constexpr int Nsensors = 208;                      // number of channels
@@ -56,12 +56,6 @@ class Geometry
   static constexpr o2::detectors::DetID::ID getDetID() { return o2::detectors::DetID::FT0; }
   void setAsideModules();
   void setCsideModules();
-  const char* getSymbolicName(int index) const
-  {
-    /// return symbolic name of sensor
-    LOG(INFO) << o2::base::GeometryManager::getSymbolicName(getDetID(), index);
-    return o2::base::GeometryManager::getSymbolicName(getDetID(), index);
-  }
   TGeoPNEntry* getPNEntry(int index) const
   {
     /// Get a pointer to the TGeoPNEntry of a chip identified by 'index'
@@ -71,8 +65,7 @@ class Geometry
 
  private:
   TVector3 mMCP[52];
-  TVector3 mAngels[28];
-  static std::string sSensorName; ///< Sensor name
+  TVector3 mAngles[28];
 
   ClassDefNV(Geometry, 2);
 };

Detectors/FIT/FT0/base/src/Geometry.cxx

@@ -108,7 +108,7 @@ void Geometry::setCsideModules()
     ac[i] *= 180 / TMath::Pi();
     bc[i] *= 180 / TMath::Pi();
     gc[i] = -1 * ac[i];
-    mAngels[i].SetXYZ(ac[i], bc[i], gc[i]);
+    mAngles[i].SetXYZ(ac[i], bc[i], gc[i]);
     mMCP[i + NCellsA].SetXYZ(xc2[i], yc2[i], zc2[i]);
   }
 }

Detectors/FIT/FT0/calibration/include/FT0Calibration/FT0CollectCalibInfo.h

@@ -32,11 +32,11 @@ void FT0Misaligner(const std::string& ccdbHost = "http://ccdb-test.cern.ch:8080"
 
   // FT0 detector
   //set A side
-  std::string symNameA = "/cave_1/barrel_1/FT0A_1";
+  std::string symNameA = "FT0A";
   pars = generateMisalignment(xA, yA, zA, psiA, thetaA, phiA);
   params.emplace_back(symNameA.c_str(), -1, pars[0], pars[1], pars[2], pars[3], pars[4], pars[5], glo);
   //set C side
-  std::string symNameC = "/cave_1/barrel_1/FT0C_1";
+  std::string symNameC = "FT0C";
   pars = generateMisalignment(xC, yC, zC, psiC, thetaC, phiC);
   params.emplace_back(symNameC.c_str(), -1, pars[0], pars[1], pars[2], pars[3], pars[4], pars[5], glo);
 
@@ -47,7 +47,7 @@ void FT0Misaligner(const std::string& ccdbHost = "http://ccdb-test.cern.ch:8080"
     map<string, string> metadata; // can be empty
     api.init(ccdbHost.c_str());   // or http://localhost:8080 for a local installation
     // store abitrary user object in strongly typed manner
-    //  api.storeAsTFileAny(&params, path, metadata, tmin, tmax);
+    api.storeAsTFileAny(&params, path, metadata, tmin, tmax);
   }
 
   if (!fileName.empty()) {

Detectors/FIT/FT0/macros/FT0Misaligner.C

@@ -361,39 +361,29 @@ void Detector::addAlignableVolumes() const
   }
 
   TString volPath = Form("/cave_1/barrel_1");
-  TString symName = Form("/cave_1/barrel_1");
-  LOG(INFO) << symName << " <-> " << volPath;
   //set A side
   TString volPathA = volPath + Form("/FT0A_1");
-  TString symNameA = symName + Form("/FT0A_1");
+  TString symNameA = "FT0A";
   LOG(INFO) << symNameA << " <-> " << volPathA;
   if (!gGeoManager->SetAlignableEntry(symNameA.Data(), volPathA.Data())) {
     LOG(FATAL) << "Unable to set alignable entry ! " << symNameA << " : " << volPathA;
   }
   //set C side
   TString volPathC = volPath + Form("/FT0C_1");
-  TString symNameC = symName + Form("/FT0C_1");
+  TString symNameC = "FT0C";
   LOG(INFO) << symNameC << " <-> " << volPathC;
   if (!gGeoManager->SetAlignableEntry(symNameC.Data(), volPathC.Data())) {
     LOG(FATAL) << "Unable to set alignable entry ! " << symNameA << " : " << volPathA;
   }
   TString volPathMod, symNameMod;
-  for (Int_t imod = 0; imod < 24; imod++) {
-    volPathMod = volPathA + Form("/0MOD_%d", imod);
-    symNameMod = symNameA + Form("/0MOD_%d", imod);
+  for (Int_t imod = 0; imod < Geometry::NCellsA + Geometry::NCellsC; imod++) {
+    TString volPath = (imod < Geometry::NCellsA) ? volPathA : volPathC;
+    volPathMod = volPath + Form("/0MOD_%d", imod);
+    symNameMod = Form("0MOD_%d", imod);
     if (!gGeoManager->SetAlignableEntry(symNameMod.Data(), volPathMod.Data())) {
       LOG(FATAL) << (Form("Alignable entry %s not created. Volume path %s not valid", symNameMod.Data(), volPathMod.Data()));
     }
   }
-
-  for (Int_t imod = 24; imod < 52; imod++) {
-    volPathMod = volPathC + Form("/0MOD_%d", imod);
-    symNameMod = symNameC + Form("/0MOD_%d", imod);
-    if (!gGeoManager->SetAlignableEntry(symNameMod.Data(), volPathMod.Data())) {
-      LOG(FATAL) << (Form("Alignable entry %s not created. Volume path %s not valid", symNameMod.Data(), volPathMod.Data()));
-    }
-  }
-  return;
 }
 
 // Class wrapper for construction of FT0-A support structure