Commit 6c1a6e7f authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'hexagonalPixelModel' into 'master' 

Support for Hexagonal Pixels and Grids

See merge request allpix-squared/allpix-squared!539
parents 0c6ad89b 6b138008

AUTHORS.md

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ The following authors, in alphabetical order, have developed or contributed to A 
* Neal Gauvin, Université de Genève, [ngauvin](https://gitlab.cern.ch/ngauvin)

* Lennart Huth, DESY, [lhuth](https://gitlab.cern.ch/lhuth)

* Daniel Hynds, University of Oxford, [dhynds](https://gitlab.cern.ch/dhynds)

* Francisco-Jose Iguaz-Gutierrez, Synchrotron SOLEIL, [iguaz-gutierrez](https://github.com/iguaz-gutierrez)

* Maoqiang Jing, Institute of High Energy Physics Beijing, [mjing](https://gitlab.cern.ch/mjing)

* Moritz Kiehn, Université de Genève, [msmk](https://gitlab.cern.ch/msmk)

* Rafaella Eleni Kotitsa, CERN, [rkotitsa](https://gitlab.cern.ch/rkotitsa)
@@ -44,6 +45,7 @@ The following authors, in alphabetical order, have developed or contributed to A 
* Edoardo Rossi, DESY, [edrossi](https://gitlab.cern.ch/edrossi)

* Jihad Saidi, Université de Genève, [jisaidi](https://gitlab.cern.ch/jisaidi)

* Andre Sailer, CERN, [sailer](https://gitlab.cern.ch/sailer)

* Tasneem Saleem, Synchrotron SOLEIL, [TasneemSaleem](https://github.com/TasneemSaleem)

* Enrico Jr. Schioppa, Unisalento and INFN Lecce, [schioppa](https://gitlab.cern.ch/schioppa)

* Sebastian Schmidt, FAU Erlangen, [schmidtseb](https://github.com/schmidtseb)

* Sanchit Sharma, Kansas State University, [SanchitKratos](https://github.com/SanchitKratos)

README.md

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ $ make install 


## Documentation



The User Manual of the most recent release version of Allpix<sup>2</sup> is available [from the website](https://cern.ch/allpix-squared/usermanual/allpix-manual.pdf).

The User Manual of the most recent release version of Allpix<sup>2</sup> is available [from the website](https://cern.ch/allpix-squared/usermanual/allpix-manual.pdf).\

The respective Doxygen reference is [published online](https://cern.ch/allpix-squared/reference/) as well.

doc/latex/references.bib

+6 −0
Original line number Diff line number Diff line
@@ -944,3 +944,9 @@ author = {S. Croft and D.S. Bond} 
  pages={27-30},

  doi={10.1109/SISPAD.1999.799251}

 }



@online{hexagons,

    author = {Amit Patel},

    title = {Hexagonal Grids},

    url = {https://www.redblobgames.com/grids/hexagons/}

}

doc/tikz/hexagon_flat.tex

0 → 100644
+22 −0
Original line number Diff line number Diff line 
\tikzset{%

  >=latex

}

\begin{tikzpicture}[thick]

     \newdimen\R

     \R=2.2cm

     \draw (0:\R) \foreach \x in {60,120,...,360} {  -- (\x:\R) };

     \foreach \x/\l/\p in

       { 60/{($\frac{p_x}{4}$, $\sqrt{3} \frac{p_y}{4}$)}/above right,

        120/{($-\frac{p_x}{4}$, $\sqrt{3} \frac{p_y}{4}$)}/above,

        180/{($-\frac{p_x}{2}$, $0$)}/above left,

        240/{($-\frac{p_x}{4}$, $-\sqrt{3} \frac{p_y}{4}$)}/below,

        300/{($\frac{p_x}{4}$, $-\sqrt{3} \frac{p_y}{4}$)}/below right,

        360/{($\frac{p_x}{2}$, $0$)}/right

       }

       \node[inner sep=1pt,circle,draw,fill,label={\p:\l}] at (\x:\R) {};



       \draw[very thick, teal] (360:\R) -- (180:\R) node[near start, below] {$p_x$};



       \draw[very thick, teal] (240:\R) -- (60:\R) node[sloped, near end, below] {$p_y$};



\end{tikzpicture}

doc/tikz/hexagon_grid_flat.tex

0 → 100644
+22 −0
Original line number Diff line number Diff line 
\tikzset{%

  >=latex

}

\begin{tikzpicture}[x=7.5mm,y=4.34mm,thick]

  \tikzset{

    box/.style={

      regular polygon,

      regular polygon sides=6,

      minimum size=10mm,

      inner sep=0mm,

      outer sep=0mm,

      rotate=0,

    draw

    }

  }



\foreach \i in {0,...,3}

    \foreach \j in {0,...,3} {

            \node[box] at (2*\i,2*\j) {};

            \node[box] at (2*\i+1,2*\j+1) {};

        }

\end{tikzpicture}