began implementing tb2022 phase 3

began implementing tb2022 phase 3

MonteCarlo/src/DetectorConstruction.cc

@@ -518,7 +518,6 @@ G4VPhysicalVolume* DetectorConstruction::Construct2022SPSTestBeam(){
     }
   }
 
-  G4cout << "Phase = " << m_alignment2022->phase << G4endl;
   if( m_alignment2022->phase == 1 ){
     G4cout << "Building phase 1 configuration" << G4endl;
     for( Survey2021* survey : m_surveyEntries2021 ){
@@ -535,8 +534,8 @@ G4VPhysicalVolume* DetectorConstruction::Construct2022SPSTestBeam(){
         zdc->Construct();
       }
     }
-  }else if( m_alignment2022->phase == 2 ){
-    G4cout << "Building phase 2 configuration" << G4endl;
+  }else if( m_alignment2022->phase == 2 || m_alignment2022->phase == 3){
+    G4cout << "Building phase " << m_alignment2022->phase << " configuration" << G4endl;
     G4String det(m_alignment2022->detector);
     G4String arm = (det.contains("1-2")) ? "1-2" : "8-1"; //Set which arm to look for in the survey entries
     G4cout << "Constructing Arm " << arm << G4endl;
@@ -577,8 +576,6 @@ G4VPhysicalVolume* DetectorConstruction::Construct2022SPSTestBeam(){
         }//end detector types
       }//end if survey.contains(arm)
     }//end loop over surveys
-  }else{
-    G4cout << "Phase 3 not implemented yet" << G4endl;
   }