Including Metrology Mask Rotation

include/MGUIOptionsDepthCalibration2024.h

@@ -74,6 +74,13 @@ class MGUIOptionsDepthCalibration2024 : public MGUIOptions
   //! Select spline file to load, splines will convert CTD->Depth
   MGUIEFileSelector* m_SplinesFileSelector;
 
+  //! Select mask metrology file to load. This gives the translation and rotation for each strip in the detector frame
+  MGUIEFileSelector* m_MaskMetrologyFileSelector;
+
+  int m_UseMaskMetCorr;
+  TGCheckButton* m_MaskMetModeCB;
+  enum ButtonIDs {c_MetFile};
+
   //! Check button if working with the Card Cage at UCSD
   TGCheckButton* m_UCSDOverride;
 

include/MModuleDepthCalibration2024.h

@@ -1,4 +1,4 @@
-/*
+/*:q
  * MModuleDepthCalibration2024.h
  *
  * Copyright (C) 2008-2008 by Andreas Zoglauer.
@@ -72,6 +72,16 @@ class MModuleDepthCalibration2024 : public MModule
   //! Get filename for CTD->Depth splines
   MString GetSplinesFileName() const {return m_SplinesFile;}
 
+  //! Enable/Disable Preamp Temp Correction
+  void EnableMaskMetrologyCorrection(bool X) {m_MaskMetrologyEnabled = X;}
+  //! Get coincidence merging true/false
+  bool GetMaskMetrologyCorrection() const { return m_MaskMetrologyEnabled; }
+
+  //! Set filename for mask metrology
+  void SetMaskMetrologyFileName( const MString& FileName) {m_MaskMetrologyFile = FileName;}
+  //! Get filename for CTD->Depth splines
+  MString GetMaskMetrologyFileName() const {return m_MaskMetrologyFile;}
+
   //! Set whether the data came from the card cage at UCSD
   void SetUCSDOverride( bool Override ) {m_UCSDOverride = Override;}
   //! Get whether the data came from the card cage at UCSD
@@ -91,22 +101,40 @@ class MModuleDepthCalibration2024 : public MModule
  protected:
   //! Returns the strip with most energy from vector Strips, also gives back the energy fraction
   MStripHit* GetDominantStrip(std::vector<MStripHit*>& Strips, double& EnergyFraction);
+
   //! Retrieve the appropriate Depth values given the DetID
-	vector<double> GetDepth(int DetID);
+  vector<double> GetDepth(int DetID);
+
   //! Retrieve the appropriate CTD values given the DetID and Grade
   vector<double> GetCTD(int DetID, int Grade);
+
   //! Normal distribution
   vector<double> norm_pdf(vector<double> x, double mu, double sigma);
-	//! Adds a Depth-to-CTD relation
-	bool AddDepthCTD(vector<double> depthvec, vector<vector<double>> ctdarr, int DetID, unordered_map<int, vector<double>>& DepthGrid, unordered_map<int,vector<vector<double>>>& CTDMap);
+
+  //! Adds a Depth-to-CTD relation
+  bool AddDepthCTD(vector<double> depthvec, vector<vector<double>> ctdarr, int DetID, unordered_map<int, vector<double>>& DepthGrid, unordered_map<int,vector<vector<double>>>& CTDMap);
+
   //! Determine the Grade (geometry of charge sharing) of the Hit
   int GetHitGrade(MHit* H);
+
   //! Load in the specified coefficients file
   bool LoadCoeffsFile(MString FName);
+
   //! Return the coefficients for a pixel
   vector<double>* GetPixelCoeffs(int PixelCode);
+
   //! Load the splines file
   bool LoadSplinesFile(MString FName);
+
+  //! Mask Metrology Correction
+  bool m_MaskMetrologyEnabled;
+
+  //! Load the metrology mask file
+  bool LoadMaskMetrologyFile(MString FName);
+
+  //! Get the x, y position of the intersection of two strips based on the Metrology Mask  
+  vector<double> GetStripIntersection(MReadOutElementDoubleStrip LVStrip, MReadOutElementDoubleStrip HVStrip);
+
   //! Get the timing FWHM noise for the specified pixel and Energy
   double GetTimingNoiseFWHM(int PixelCode, double Energy);
 
@@ -147,6 +175,12 @@ class MModuleDepthCalibration2024 : public MModule
   unordered_map<int, vector<double>> m_DepthGrid;
   bool m_SplinesFileIsLoaded;
   bool m_CoeffsFileIsLoaded;
+  bool m_MaskMetrologyFileIsLoaded;
+
+  // The Mask Metrology
+  MString m_MaskMetrologyFile;
+  map<MReadOutElementDoubleStrip, vector<double>> m_MaskMetrology;
+
 
   // boolean for use with the card cage at UCSD since it tags all events as detector 11
   bool m_UCSDOverride;

include/MReadOutAssembly.h

@@ -454,8 +454,7 @@ class MReadOutAssembly : public MReadOutSequence
   bool m_StripHitBelowThreshold;
   MString m_StripHitBelowThresholdString;
 
-
-
+
   //! True if event has been filtered out
   bool m_FilteredOut;
 

src/MGUIOptionsDepthCalibration2024.cxx

@@ -75,8 +75,30 @@ void MGUIOptionsDepthCalibration2024::Create()
   m_SplinesFileSelector = new MGUIEFileSelector(m_OptionsFrame, "Select a splines file:",
       dynamic_cast<MModuleDepthCalibration2024*>(m_Module)->GetSplinesFileName());
   m_SplinesFileSelector->SetFileType("splines", "*.csv");
-  TGLayoutHints* Label2Layout = new TGLayoutHints(kLHintsTop | kLHintsCenterX | kLHintsExpandX, 10, 10, 10, 10);
-  m_OptionsFrame->AddFrame(m_SplinesFileSelector, Label2Layout);
+//  TGLayoutHints* Label2Layout = new TGLayoutHints(kLHintsTop | kLHintsCenterX | kLHintsExpandX, 10, 10, 10, 10);
+  m_OptionsFrame->AddFrame(m_SplinesFileSelector, LabelLayout);
+
+  m_MaskMetModeCB = new TGCheckButton(m_OptionsFrame, "Enable mask metrology correction and read calibration from file:", c_MetFile);
+  m_MaskMetModeCB->SetState((dynamic_cast<MModuleDepthCalibration2024*>(m_Module)->GetMaskMetrologyCorrection() == 1) ? kButtonDown : kButtonUp);
+  m_MaskMetModeCB->Associate(this);
+  m_OptionsFrame->AddFrame(m_MaskMetModeCB, LabelLayout);
+
+  m_UseMaskMetCorr = dynamic_cast<MModuleDepthCalibration2024*>(m_Module)->GetMaskMetrologyCorrection();
+
+//  TGLayoutHints* FileLabelLayout = new TGLayoutHints(kLHintsTop | kLHintsExpandX, m_FontScaler*65 + 21*m_FontScaler, m_FontScaler*65, 0, 2*m_FontScaler);
+
+  m_MaskMetrologyFileSelector = new MGUIEFileSelector(m_OptionsFrame, "", dynamic_cast<MModuleDepthCalibration2024*>(m_Module)->GetMaskMetrologyFileName());
+  m_MaskMetrologyFileSelector->SetFileType("metrology", "*.csv");
+  m_OptionsFrame->AddFrame(m_MaskMetrologyFileSelector, LabelLayout);
+
+
+  if (m_UseMaskMetCorr) {
+    m_MaskMetrologyFileSelector->SetEnabled(true);
+  } else {
+    m_MaskMetrologyFileSelector->SetEnabled(false);
+  }
+
+
 
   m_UCSDOverride = new TGCheckButton(m_OptionsFrame, "Check this box if you're using the card cage at UCSD", 1);
   m_UCSDOverride->SetOn(dynamic_cast<MModuleDepthCalibration2024*>(m_Module)->GetUCSDOverride());
@@ -97,16 +119,28 @@ bool MGUIOptionsDepthCalibration2024::ProcessMessage(long Message, long Paramete
   bool Status = true;
 
   switch (GET_MSG(Message)) {
-    case kC_COMMAND:
-      switch (GET_SUBMSG(Message)) {
-        case kCM_BUTTON:
-          break;
-        default:
+  case kC_COMMAND:
+    switch (GET_SUBMSG(Message)) {
+    case kCM_BUTTON:
+      break;
+    case kCM_CHECKBUTTON:
+      switch (Parameter1) {
+        case c_MetFile:
+          if (m_MaskMetModeCB->GetState() == kButtonDown) {
+            m_UseMaskMetCorr = 1;
+            m_MaskMetrologyFileSelector->SetEnabled(true);
+          } else if (m_MaskMetModeCB->GetState() == kButtonUp) {
+            m_UseMaskMetCorr = 0;
+            m_MaskMetrologyFileSelector->SetEnabled(false);
+          }
           break;
       }
-      break;
     default:
       break;
+    }
+    break;
+  default:
+    break;
   }
 
   if (Status == false) {
@@ -127,6 +161,10 @@ bool MGUIOptionsDepthCalibration2024::OnApply()
 
   dynamic_cast<MModuleDepthCalibration2024*>(m_Module)->SetCoeffsFileName(m_CoeffsFileSelector->GetFileName());
   dynamic_cast<MModuleDepthCalibration2024*>(m_Module)->SetSplinesFileName(m_SplinesFileSelector->GetFileName());
+
+  if (dynamic_cast<MModuleDepthCalibration2024*>(m_Module)->GetMaskMetrologyCorrection() != m_UseMaskMetCorr) dynamic_cast<MModuleDepthCalibration2024*>(m_Module)->EnableMaskMetrologyCorrection(m_UseMaskMetCorr);
+
+  dynamic_cast<MModuleDepthCalibration2024*>(m_Module)->SetMaskMetrologyFileName(m_MaskMetrologyFileSelector->GetFileName());
   dynamic_cast<MModuleDepthCalibration2024*>(m_Module)->SetUCSDOverride(m_UCSDOverride->IsOn());
 
   return true;