Skip to content

fix rotation of pixel map to follow sector #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 16, 2024
Merged

fix rotation of pixel map to follow sector #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common-tools/clas-jcsg/src/main/java/org/jlab/detector/geom/RICH/RICHGeoCalibration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void load_CCDB(ConstantsManager manager, int run, int ncalls, RICHGeoPara

if((debugMode>=1 || geopar.DEBUG_GEO_CONSTS>=1) && ncalls<Math.max(1,geopar.DEBUG_GEO_CONSTS)) {
System.out.format("------------------------------------------------------------- \n");
System.out.format("RICH: Load ALI Calibration from local TxT file for RICH 4d sector %4d run %6d \n", irich, isec, run);
System.out.format("RICH: Load ALI Calibration from local TxT file for RICH %4d sector %4d run %6d \n", irich, isec, run);
System.out.format("------------------------------------------------------------- \n");

dump_AliCalibration(isec, "TXT ");
Expand All @@ -102,7 +102,7 @@ public void load_CCDB(ConstantsManager manager, int run, int ncalls, RICHGeoPara

if((debugMode>=1 || geopar.DEBUG_GEO_CONSTS>=1) && ncalls<=Math.max(1,geopar.DEBUG_GEO_CONSTS)) {
System.out.format("------------------------------------------------------------- \n");
System.out.format("RICH: Load AER Calibration from local TxT file for RICH 4d sector %4d run %6d \n", irich, isec, run);
System.out.format("RICH: Load AER Calibration from local TxT file for RICH %4d sector %4d run %6d \n", irich, isec, run);
System.out.format("------------------------------------------------------------- \n");

dump_AerCalibration(isec, "TXT ");
Expand Down
13 changes: 7 additions & 6 deletions common-tools/clas-jcsg/src/main/java/org/jlab/detector/geom/RICH/RICHGeoFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public class RICHGeoFactory{

private RICHGeant4Factory richfactory = new RICHGeant4Factory();
private RICHPixelMap pixelmap = new RICHPixelMap();
private RICHPixel pmtpixels = null;
private RICHGeoParameters geopar = new RICHGeoParameters();
private RICHGeoCalibration geocal = new RICHGeoCalibration();

Expand Down Expand Up @@ -87,7 +86,7 @@ public RICHGeoFactory(int FactoryMode, ConstantsManager manager, int run, boolea
geocal.load_CCDB(manager, run, Ncalls, geopar);

if(FactoryMode>0){
// global pixel coordinate indexes
// global pixel coordinate indexes (obsolete)
pixelmap.init_GlobalPixelGeo();

// RICH survey (obsolete)
Expand Down Expand Up @@ -577,15 +576,16 @@ public int select_AeroforTraj(int isec, Line3D first, Line3D second, Line3D thir


//------------------------------
public Vector3d GetPixelCenter(int ipmt, int anode){
/*public Vector3d GetPixelCenter(int ipmt, int anode){
//------------------------------

// obsolete as refers to un-aligned richfactory
Vector3d Vertex = richfactory.GetPhotocatode(ipmt).getVertex(2);
Vector3d VPixel = Vertex.plus(pmtpixels.GetPixelCenter(anode));
//System.out.format("Std vtx %8.3f %8.3f %8.3f \n",Vertex.x, Vertex.y, Vertex.z);
return new Vector3d (VPixel.x, -VPixel.y, VPixel.z);

}
}*/


//------------------------------
Expand All @@ -598,7 +598,7 @@ public Point3D get_Pixel_Center(int isec, int ipmt, int anode){
Face3D compo_face = get_Layer(isec, ilay).get_CompoFace(ipmt-1, 0);
Vector3d Vertex = toVector3d( compo_face.point(1) );

Vector3d VPixel = Vertex.plus(pmtpixels.GetPixelCenter(anode));
Vector3d VPixel = Vertex.plus(get_Layer(isec, ilay).get_PMTPixels().GetPixelCenter(anode));
return new Point3D (VPixel.x, -VPixel.y, VPixel.z);
}

Expand Down Expand Up @@ -1347,7 +1347,8 @@ public void generate_PixelMap(RICHLayer layer, int ico, Shape3D compo_plane, Lis
}

if(downversor!=null && rightversor!= null) {
pmtpixels = new RICHPixel(new Vector3d(0.,0.,0.), downversor, rightversor);
RICHPixel pmtpixels = new RICHPixel(new Vector3d(0.,0.,0.), downversor, rightversor);
layer.set_PMTPixels(pmtpixels);
if(debugMode>=1){
pmtpixels.show_Pixels( vertex );
vertex = toVector3d( layer.get_CompoFace(5,0).point(1) );
Expand Down
9 changes: 9 additions & 0 deletions common-tools/clas-jcsg/src/main/java/org/jlab/detector/geom/RICH/RICHLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public class RICHLayer extends ArrayList<RICHComponent> {
private ArrayList<Integer> compo_list = new ArrayList<Integer>();

private RICHFrame local_frame = new RICHFrame();
private RICHPixel pmtpixels = null;


// ----------------
Expand Down Expand Up @@ -99,6 +100,14 @@ public RICHLayer(int isec, int ilay, RICHGeoParameters geopar) {
public int get_size() { return this.size(); }
// ----------------

// ----------------
public void set_PMTPixels(RICHPixel pmtpixels){ this.pmtpixels = pmtpixels;}
// ----------------

// ----------------
public RICHPixel get_PMTPixels(){ return this.pmtpixels;}
// ----------------

// ----------------
public Shape3D get_TrackingSurf() {
// ----------------
Expand Down